Merge "Update annotations for UiccCardInfo APIs"