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