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