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