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