[automerger skipped] Enable user graularity for lockdown mode am: 9281fb98e3 -s ours am: c3b9c7f66a -s ours am: a0a2476ae2 -s ours am: d4ded2e1fc -s ours

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

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

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