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