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