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

[automerger skipped] Merge "Enable user graularity for lockdown mode" into sc-qpr1-dev am: 1032594c -s ours am: 6018784c -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: I40fc118f68bc0601b7430274ae761fae48ab9121
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>