Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3498934 Change-Id: Id4530616d92c5e20b9040e0d8d9dd1ee96b5f14c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>