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