[automerger skipped] Merge "Move BLOCKED_REASON_* constants from NPMS into ConnectivityManager." am: 8c03c2a82e am: 13b4d67d40 am: 90e1746fe1 -s ours
am skip reason: skip tag Change-Id I4c544415e12adf442fd2415c371b1b70a39c3aa4 with SHA-1 2e20a1a29e is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1651532
Change-Id: If0f92d490fc903ba2037766a69365eb44af8027e
This commit is contained in: