Merge "Add and use config_deviceStatesToReverseDefaultDisplayRotationAroundZAxis"