Merge "Adds new cts tests around the refactoring of DeviceStateManager#cancelOverrideRequest"