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