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