Merge "Add UiccCardInfo APIs"
am: 8acece0441

Change-Id: Id9aececc41b6627cfe4ced5de4c58996005729b9