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