Merge changes from topic "cs-generalize-underlying-networks" am: 678d27faca

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie5815ada76edd5d34c8cb8a184e7b1bc59fee005