[automerger skipped] Enable user graularity for lockdown mode am: baca9125f1 -s ours am: 90ae61e772 -s ours am: 2ca23affe0 -s ours am: 38e049a471 -s ours

am skip reason: Merged-In I4f30e56550729db7d673a92d2a1250509713f36d with SHA-1 0b56ec9aa2 is already in history

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

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