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