Merge "Remove the UICC specific code from android.se.omapi"