am 0c99f7e3: am ba3cf72a: Merge "Telephony: Clarify IccCardConstants.State enum"

* commit '0c99f7e36da7ebc92d0a084f3dc1717a7c31423e':
  Telephony: Clarify IccCardConstants.State enum