Merge "Move BLOCKED_REASON_* constants from NPMS into ConnectivityManager." into sc-dev