Merge "Fix flaking DeviceIdleController tests."