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