Merge changes from topic "am-4b90382f938f437a92b13e188f18d8ed"

* changes:
  [automerger skipped] Revert "Revert "Update VPN capabilities when its underlying network set is null."" am: 9f98789d -s ours am: a8056e3f -s ours am skip reason: change_id Id0abc4d304bb096e92479a118168690ccce634ed with SHA1 4fa80e8a is in history
  [automerger skipped] Merge "Remove ConnectivityManager and its usages from NetworkStatsService." into pi-dev am: a24113f0 -s ours am: c14d2102 -s ours am skip reason: change_id I57e117bb4e9efe491b19d6b5a479f2d58d1c58e6 with SHA1 02c50ef1 is in history