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