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