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