[automerger skipped] Merge changes from topic "rm-forceAllNetworkTypes-sc-v2-dev" into sc-v2-dev am: 1b0915c261 -s ours

am skip reason: Merged-In I14d31071655204fe6ad36c71f7f521640e01c96e with SHA-1 cbb4d498c2 is already in history

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

Change-Id: I2d6138a52c7a458f823c008573862cff198d5929