Merge "Merge "Update annotations for UiccCardInfo APIs" am: c76c5529bf am: 6549c55523 am: 0fed0f97a6"