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