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