Merge "Update javadoc of deprecated UICC APIs"