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

Change-Id: I11e2bdfbf5e58f8095db017ffde9a643a5a8adaf