Merge "Fix ManagedProfileTimeoutTest: testWorkProfileTimeoutUserActivity" into android11-tests-dev