Merge "Remove ForceAllNetworkTypes from test" am: f7762c823a am: fed2d0614f

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1824632

Change-Id: I37e57c04a53a1192d27c174fe7da689c98e43d70