[automerger skipped] DO NOT MERGE - Merge RQ3A.210605.005 am: e7fde0c39a -s ours am: 5ba981c20a -s ours

am skip reason: Merged-In I524644366a398b34de8f659d0d0d275f3f513c0c with SHA-1 d6d3bf0b89 is already in history

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

Change-Id: Icdf0f317488c7b1b7f39acffdd5b1f1219ecf51d