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