Merge "Temporarily disable DeviceConfigTest.testOnPropertiesChangedListener"