tree ba2643b93bc61cf32ccf7e5f998892c80418c5b1
parent d4f722639b2df200b553c33d6b5fb2f90c5928ce
parent 3332b73738492450425d355b45f1737c64beb4b7
author Xin Li <delphij@google.com> 1637275073 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1637275073 +0000

[automerger skipped] Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918 am: bf45599d43 -s ours am: 69e79704e3 -s ours am: 3332b73738 -s ours

am skip reason: Merged-In I9ac05f5da437030e1b5db082ddaf7959f82acccd with SHA-1 d3f9214763 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16279041

Change-Id: I3077fe21b6acaffb2ff47b4fb1b10d2bea6b1af9