Merge "Add UiccCardInfo APIs" am: 8acece0441
am: a1ce4f0ec9

Change-Id: I24b89cb46f6d9d8e4e0f9f24cde49090615ed007