Merge "List the CONNECTION_STATE_CHANGED broadcast for MAP as protected" into...
Merge "List the CONNECTION_STATE_CHANGED broadcast for MAP as protected" into nyc-dev am: 95aa2fc3
am: bda2699c
* commit 'bda2699c':
Change-Id: I25652b357392edabccad414c670bd762082ead83