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