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