[automerger skipped] Merge "Enable user graularity for lockdown mode" into...

[automerger skipped] Merge "Enable user graularity for lockdown mode" into rvc-qpr-dev am: 5a1a9ba4 -s ours am: ab80f82c -s ours

am skip reason: Merged-In I4f30e56550729db7d673a92d2a1250509713f36d with SHA-1 0b56ec9a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20192647



Change-Id: I1e59139b8ffe448c1300af13225cad2083244538
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>