[automerger skipped] Enable user graularity for lockdown mode am: 5e40f39f...

[automerger skipped] Enable user graularity for lockdown mode am: 5e40f39f -s ours am: d314c8c7 -s ours am: 0f032e1e -s ours am: 7c969539 -s ours am: 1d8a1199 -s ours am: 58e3c833 -s ours

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

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



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