[automerger skipped] Merge "Remove forceAllNetworkTypes from test" into...

[automerger skipped] Merge "Remove forceAllNetworkTypes from test" into sc-v2-dev am: 6f1aaa7e -s ours am: 9d20683b -s ours

am skip reason: Merged-In I0907a08ca1dd8a14a738db4057ea5ff6a0cd925a with SHA-1 8216831b is already in history

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

Change-Id: I64cdf91b46b18056e26a0274796cc67c5086382b