[automerger skipped] Enable user graularity for lockdown mode am: 598b28a0...

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