tree 2a761a969b4ab3151f0b3d73f5001a6c979e08c7
parent 6f8a0498d6d53c861a8318daa12c7f9c6cc231b6
parent 695171b9f2fc684d9b9bf385933d73f0cd1e306e
author Xin Li <delphij@google.com> 1646820360 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1646820360 +0000

[automerger skipped] Merge "Merge Android 12L" am: e6953d54a5 -s ours am: 0945458d9f -s ours am: 695171b9f2 -s ours

am skip reason: Merged-In I03636e6b8b4dc200fcb039b99190759bc7d5e776 with SHA-1 3acad24476 is already in history

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

Change-Id: Id55c010651d8870274a82ff08ce84942bac55fe7