Merge "Update javadoc of deprecated UICC APIs" am: e73b46c9d9

Change-Id: Ia4dc03b5a32d56f9df3ee146652a8901db5823c5