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