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