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

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

Change-Id: Ib208ef77d45dd53b8d839c38a7f5c335c56b7899