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