[automerger skipped] Enable user graularity for lockdown mode am: 9281fb98...

[automerger skipped] Enable user graularity for lockdown mode am: 9281fb98 -s ours am: c3b9c7f6 -s ours am: a0a2476a -s ours am: 33ba30c8 -s ours

am skip reason: Merged-In I4f30e56550729db7d673a92d2a1250509713f36d with SHA-1 598b28a0 is already in history

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



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