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

Change-Id: Ic8cbf5d79638354d913362039a0a4166d2b86ba1