tree b7eedbb8bd0c6e78508b5f5cc4171a9d03e80ad1
parent 2832f868d76326e99eae72ff50c3584be4e08579
author Yuhan Zhao <zhaoyuhan@google.com> 1583274817 -0800
committer Yuhan Zhao <zhaoyuhan@google.com> 1583886450 +0000

Rebasing ag/10503271 into the rvc-dev branch.

Test: atest -c 'CtsDevicePolicyManagerTestCases:com.android.cts.devicepolicy.MixedProfileOwnerTest#testLockTask'
Bug: b/149778685
Change-Id: I094b8e480f5c37628b98c73a82fdd325d0e63bec