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