Merge "Put back annotations in DeviceStateRotationLockSettingControllerTest" into main