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