Merge changes from topic "am-f59e5e992a2d448d8991d0ff384a3aa2" into rvc-d1-dev-plus-aosp

* changes:
  Merge "「DO NOT MERGE」Revert "Get ApnIpType from ConnectivityManager#getLinkProperties()"" into rvc-dev am: eca0b3f9fb am: 691e4c6427
  「DO NOT MERGE」Revert "Get ApnIpType from ConnectivityManager#getLinkProperties()" am: d461be709f am: a4fbb2a737
This commit is contained in:
Automerger Merge Worker
2020-06-19 15:53:28 +00:00
committed by Android (Google) Code Review

Diff Content Not Available