Merge changes from topic "include-uiccapptype"

* changes:
  Make mainline IPsec(IKE) to statically include @UiccAppType
  move UiccAppType to annotation class