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