Merge commit '969907f3f59cf9420c3bd9d672b509196cf82cbe' * commit '969907f3f59cf9420c3bd9d672b509196cf82cbe': Make hasIccCard return true if RUIM card is present.
Merge commit '969907f3f59cf9420c3bd9d672b509196cf82cbe' * commit '969907f3f59cf9420c3bd9d672b509196cf82cbe': Make hasIccCard return true if RUIM card is present.