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