move UiccAppType to annotation class
am: bcc31107cd

Change-Id: I444e69590c1f9e48e300f4c9bddfa2244cf9c676