[automerger skipped] Merge "Add method to get phoneId from slotId" am: b37d524c am: 4d551c66
am: 8957b8d8 -s ours
am skip reason: change_id I7f0b6a86bc259090a249fb56135c55d846cdbea2 with SHA1 db63432e is in history
Change-Id: I2582ed740c6a44446427f011d3dba3748a90d0c5