Merge "Merge "Lock down networking when waiting for always-on" into nyc-dev...
Merge "Merge "Lock down networking when waiting for always-on" into nyc-dev am: d171df66 am: 43fbfbf9" into nyc-mr1-dev-plus-aosp
am: 44bc81e6
* commit '44bc81e6':
Change-Id: I09b4ac15a63b8e8972e19ffeccfa1a6eccfdded2