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

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

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