[automerger skipped] Merge "Enable user graularity for lockdown mode" into tm-dev am: 19336106d2 am: 79ba30d62e -s ours am: ff5b80ffac -s ours am: dbc832b540 -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: I822eee8d6f06896250584f48327aca66889b7ad3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: