[automerger skipped] Merge "Merge "Allow automatic unlocking of work profile by Digital Wellbeing" into rvc-dev am: 54c8e6a9a4 am: 9fb5102197" into rvc-d1-dev-plus-aosp am: 6561863a8d -s ours am: 4ec7bbb912 -s ours
am skip reason: Change-Id I4d241a4d7f11817f5171c5b064c379ff17aeaa43 with SHA-1 a8c58f06d0 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11721687
Change-Id: I534034d252e7c4517d33c8e0fbe0be59d0e6674a
This commit is contained in: