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