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

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

Change-Id: Ic08f408e882f2378844cd416bf8f749153d607a9