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