[automerger skipped] Merge "Expose constants of ConnectivityManager" am: cb20318619 am: 9b01e26848 am: bc7c12a84f -s ours

am skip reason: skip tag Change-Id I715c766ad8e5eb54f4dc67239c1dbca7239506fc with SHA-1 cf6d450eb8 is already in history

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

Change-Id: I998cf20b3f54ccdfadf46e64ee655858e3534097
tree: e8e5284e4e35d97345b1ca01b1668507a415b2f9
  1. framework/
  2. service/
  3. test/
  4. OWNERS
  5. TEST_MAPPING