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

[automerger skipped] Merge "Enable user graularity for lockdown mode" into sc-dev am: 595f1caa -s ours am: 57f01ddb -s ours am: 5fc5d1e1 -s ours am: 66ae67ff -s ours

am skip reason: Merged-In I4f30e56550729db7d673a92d2a1250509713f36d with SHA-1 9281fb98 is already in history

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



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