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