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