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