Merge "Merge "Fix ManagedProfileTimeoutTest: testWorkProfileTimeoutUserActivity" into android12L-tests-dev am: 870f0e3d5a"