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