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