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