Merge changes from topic "revert-1579872-vcn07-WIQQMUVMTJ" am: edc9b873d3

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I099f467447b6773aca92c10699ba845438976fb7