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