Merge "Merge "Asserts foreground apps always have network access." into nyc-dev am: 68aeb4d914 am: 10dd3d7a84" into nyc-mr1-dev-plus-aosp