Merge "Merge "Covers more corner cases on restricted network modes:" into nyc-dev am: b10c777ceb am: c88f39571c" into nyc-mr1-dev-plus-aosp