Merge "New system api to get UICC terminal based on slot number" am: 0d225be680 am: 7222dbc0a0

Change-Id: I6dfb70781fa94c518206f3e989fd810c5d9284d5