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