State override is only handled when state is changed from CONNECTED to SUSPENDED but not reverse path. Handle both ways for SUSPENDED state. Bug: 148678431 Test: FrameworkNetTests Change-Id: I9333f865d61bbf008fdb8ca162ad17dfdffd1d67