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