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