tree 107f37e22df55f25414160d9166e7d11f4a0d33a
parent 996e1575583888e75c408330408a7bd51e1ad40e
parent 5ba981c20a17b23ecee53a4940498f976072ee61
author Xin Li <delphij@google.com> 1624257764 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1624257764 +0000

[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