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