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