[automerger skipped] Enable user graularity for lockdown mode am: 598b28a058 -s ours am: 501b2227ad -s ours

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

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

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