Merge "Update annotations for UiccCardInfo APIs"
am: c76c5529bf

Change-Id: I229d251c7f3749738d407ced2464a44b231f9bf5