[automerger skipped] Merge "Add INVALID_STATE to list of errors for when there is only one modem available" am: c957851584
am: d188e7cd93 -s ours
am skip reason: change_id I2b57ab99a376bcab26012d08f00284d65f915bc3 with SHA1 52b3503064 is in history

Change-Id: Ic12d73b062cb19c5a7abf676118997f09f63304f