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