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