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

* commit 'bda2699c814b7b5bece6cb5b9cc101b66b255b74':

Change-Id: I25652b357392edabccad414c670bd762082ead83