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