Merge "SIM slot related interface changes" am: 384fa7b6dc am: 8a52ba05e2
am: 14d0000c78

Change-Id: Idcb6b457289f4afc7959849cd8ffd882d4022745