Merge "Merge "Skip \'network may be monitored\' if dying or locked" into...
Merge "Merge "Skip \'network may be monitored\' if dying or locked" into nyc-dev am: bc733471 am: 36eb3771" into nyc-mr1-dev-plus-aosp
am: eb0d7ae8
* commit 'eb0d7ae8':
Change-Id: I38b2a6c33ef35428deff5f0b4102d33d54d88fda