[automerger skipped] Merge "Add a new API to query SIM call manager per subid"...
[automerger skipped] Merge "Add a new API to query SIM call manager per subid" am: 5ffa18a2 am: ef55e279 -s ours
am: f911c83c -s ours
am skip reason: change_id I9c2d589f81e4796e6ba339b1a5cd58d1e722dbfd with SHA1 e56583b4 is in history
Change-Id: I58444de967166acfd9f80d0e7a08270f52e3f4f6