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

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

Change-Id: Id03c0eb742af83c08cb7ea84eb0ff217b3fab0e0