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