[automerger skipped] Merge "Move BLOCKED_REASON_* constants from NPMS into ConnectivityManager." am: eb3ba19447 am: c97c779c98 am: 688f015e64 -s ours

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

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

Change-Id: If0f92d490fc903ba2037766a69365eb44af8027e
tree: eb0c4fe2e97225227f60b73e0c1e499898405d92
  1. framework/
  2. service/
  3. services/
  4. tests/
  5. OWNERS
  6. TEST_MAPPING