Merge "List the CONNECTION_STATE_CHANGED broadcast for MAP as protected" into nyc-dev
am: 95aa2fc323

* commit '95aa2fc3234f0c842cf9a2b0de44e2f093dcb5d5':
  List the CONNECTION_STATE_CHANGED broadcast for MAP as protected

Change-Id: Ia8dc4f70e9c2dd5151197d4d1933bfc8650a8fff