Merge "Fix MixedProfileOwnerTest#testLockTask_emergencyDialer failure"