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

[automerger skipped] Enable user graularity for lockdown mode am: baca9125 -s ours am: 90ae61e7 -s ours am: 2ca23aff -s ours

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

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



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