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

[automerger skipped] Merge "Enable user graularity for lockdown mode" into sc-v2-dev am: cff292bd -s ours am: d0c7c26b -s ours am: 663a006f -s ours

am skip reason: Merged-In I4f30e56550729db7d673a92d2a1250509713f36d with SHA-1 23cb84f8 is already in history

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



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