Merge commit '1247a6444bb9f006e0b9def5cd15d626785424bb' * commit '1247a6444bb9f006e0b9def5cd15d626785424bb': Clean up RIL_SIM_* in RILConstants
Merge commit '1247a6444bb9f006e0b9def5cd15d626785424bb' * commit '1247a6444bb9f006e0b9def5cd15d626785424bb': Clean up RIL_SIM_* in RILConstants