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

Change-Id: Idd5b77ef5f8b36eac6d2b79a9d16b4ffbd548684