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