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