[automerger skipped] Merge "Add a new API to query SIM call manager per subid" am: 5ffa18a2f6
am: ef55e27903 -s ours
am skip reason: change_id I9c2d589f81e4796e6ba339b1a5cd58d1e722dbfd with SHA1 e56583b45c is in history

Change-Id: I16adc63f6a9806b28f28715411dee6055f0a45c3