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

Change-Id: I91dd2f7973670403c51210c07a6d12f14a63e4e0