tree 7ffb44808d2fdc1b0dfa12611d6928583f4751b7
parent ae3fb7362c22dd3bef053423d20a7783459bbb58
parent 81d2adca153ce004b1369c9741ff08698455fc0f
author Xin Li <delphij@google.com> 1624292072 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1624292072 +0000

[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