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