Merge "Update javadoc of deprecated UICC APIs" am: e73b46c9d9 am: e33a7cb5c3 am: 606159f661

Change-Id: I9b6d18c35bb77d4f7b39a4b11ace679480388b58