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