[automerger skipped] move UiccAppType to annotation class am: bcc31107cd am: 15add5d1a8 am: 69424af797 -s ours
am skip reason: Change-Id I1207418cc83217cefc603589496660aa0d4be202 with SHA-1 d1b06a2090 is in history

Change-Id: I0bd95345c2e8144127dd49344c0bed1cd68ff78e