Merge "List the CONNECTION_STATE_CHANGED broadcast for MAP as protected" into nyc-dev