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

* commit '0a200487422db41f41881c47eb87945c56aa9d43':
  List the CONNECTION_STATE_CHANGED broadcast for MAP as protected

Change-Id: I817bfea1cd21743869a4b5bdf2b22fb30f45b431