tree 978108b16a2fa36684048b47606e5f870d601cc4
parent cab6183ca44b1ed8b9e20380ccdd911002768609
parent e6953d54a5f60f5e2aab72a24d5c9a422ae334a9
author Xin Li <delphij@google.com> 1646724118 +0000
committer Xin Li <delphij@google.com> 1646759614 +0000

[Resolved conflict] Merge "Merge Android 12L" am: e6953d54a5

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

Ignore-AOSP-First: automerger CL from AOSP
Change-Id: Ib5909fcd5078da0beaf399695bc25b28c4eb7918