Merge "Add INVALID_STATE to list of errors for when there is only one modem available"
am: c957851584

Change-Id: I91b4e529408d34b101149d78302e59cf3b1b6be6