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

am skip reason: subject contains skip directive

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

Change-Id: I559a987aa2bcc7102d81975609bf8d9cf701773e