Merge "Remove forceAllNetworkTypes from test" am: bc48cdaf46 am: 15503f12d6

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

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