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