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