Merge "Add INVALID_STATE to list of errors for when there is only one modem available" into qt-dev am: ef4abb83b3
am: 51cc8324d5

Change-Id: I95d66e3b757fd2bf1ee296dea3a6c0a388ce84cc