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