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