[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 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: I828f97006384f01d56771e525b89b03a546e52b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>