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

Change-Id: I6486a387f05994c88b90d437f539fc401f56603b