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