[automerger skipped] Merge "Expose constants of ConnectivityManager" am: 5d7d6554c2 am: d7080db9f3 am: 995e378307 -s ours

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

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

Change-Id: I998cf20b3f54ccdfadf46e64ee655858e3534097