Merge "Add ConnectivityManager.TYPE_PROXY to SystemApi" am: 5dccc26e60

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1512885

Change-Id: I0eb069c5ed0daca29f1bc4d3fd62f83879985b1c
tree: 06220db374e1497c6586b95a0b3138a31170a7ab
  1. core/
  2. services/
  3. tests/