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