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