[automerger skipped] Merge "Enable user graularity for lockdown mode" into...

[automerger skipped] Merge "Enable user graularity for lockdown mode" into rvc-dev am: abf1cfa4 -s ours am: f6f4800b -s ours am: 08e240c3 -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: I12ec994282adce697af8d6b796176bc391d9ed2a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>