Merge "Merge "Lock down networking when waiting for always-on" into nyc-dev am: 1540a79a8b am: 43fbfbf94c" into nyc-mr1-dev-plus-aosp
am: 16fcd4b42b

* commit '16fcd4b42b026ac9d5ece854bc3c6d8a445c7fc9':

Change-Id: I09b4ac15a63b8e8972e19ffeccfa1a6eccfdded2