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

Change-Id: I831e44185649620ad9b48c2db7b103218638912a