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