Yan Yan 614fd1b51b Merge changes from topic "include-uiccapptype" ...

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

2020-01-10 00:23:28 +00:00

..

android

Merge changes from topic "include-uiccapptype"

2020-01-10 00:23:28 +00:00

com/android

Merge "Handle 5G meteredness in telephony framework"

2020-01-09 05:03:24 +00:00