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