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