[automerger skipped] Enable user graularity for lockdown mode am: 598b28a0 -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: Ia38998f7f907fe9f05023841a092fc9bdabf5ad1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>