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