Merge "Test: Fix flaky PhonePolicyTest and ActiveDeviceManagerTest"