[automerger skipped] Merge "Enable user graularity for lockdown mode" into sc-dev am: 595f1caaea -s ours am: 57f01ddb22 -s ours am: 5fc5d1e14e -s ours am: 66ae67ff4e -s ours am: df167bca15 -s ours

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

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

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