Merge "New system api to get UICC terminal based on slot number" am: 0d225be6 am: 7222dbc0 am: eb368aed Change-Id: I4f94c604cf8e0e1f7a5b29260f532f18995ce43e