[automerger skipped] Merge "Move BLOCKED_REASON_* constants from NPMS into ConnectivityManager." am: 266578d5cd am: 5330af9215 am: 3b72adfd00 -s ours

am skip reason: skip tag Change-Id I4c544415e12adf442fd2415c371b1b70a39c3aa4 with SHA-1 1d0d9b4627 is already in history

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

Change-Id: If0f92d490fc903ba2037766a69365eb44af8027e
tree: bd972ff990e9b6940d7e90dd3ebde08484ae5353
  1. framework/
  2. service/
  3. OWNERS
  4. TEST_MAPPING