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