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