[automerger skipped] Merge "RIL Tests for CSG and Multi-PLMN HAL Conversion"...
[automerger skipped] Merge "RIL Tests for CSG and Multi-PLMN HAL Conversion" am: 8ce4fee3 am: 9e4316b7 -s ours
am skip reason: Change-Id I713d1f4ae22f535cd45e8f9cb7f6401baaf67171 with SHA-1 b41717ab is in history
Change-Id: I02d66b18986c002aa3d8cf217847ced59303f2da