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