Rebasing ag/10503271 into the rvc-dev branch.

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