Merge "Merge "Do not mark in-process NetworkStack as persistent" into qt-dev...
Merge "Merge "Do not mark in-process NetworkStack as persistent" into qt-dev am: 0a51e93a am: ab25d7c2" into qt-r1-dev-plus-aosp
am: 1e05e912
Change-Id: Idcabfeb859b7a0fdb1eceff65085f6ece012dd6b