Merge "Remove forceAllNetworkTypes from test" am: bc48cdaf46

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1824613

Change-Id: I460b93a1a9d04ecdf687761eea3461ecf0346860
tree: 14a8728963df89ea2c20d106ef63290913f3fa3d
  1. core/
  2. services/