[automerger skipped] Merge "Enable user graularity for lockdown mode" into tm-dev am: 19336106d2 am: 3999eb2f9f -s ours
am skip reason: Merged-In I4f30e56550729db7d673a92d2a1250509713f36d with SHA-1 ccead0884b is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20181501
Change-Id: I2fed36e9151fd349b1ecf18ef2ab81dc89ab2330
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: