[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: 682b7ec4 -s ours am: 2e934c5d -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: I8317a6ff223b92bfc7ae9440af486404c8b66702
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>