[automerger skipped] Merge Android 12L am: c3f6216207 -s ours

am skip reason: Merged-In If11cffc2b37f0868ff178d95a9f946700cb59ba0 with SHA-1 56ab3595a5 is already in history

Original change: https://android-review.googlesource.com/c/platform/prebuilts/module_sdk/Connectivity/+/2013283

Change-Id: I2938283dfef53c4f18da5d110941d0832d49fdd6
tree: 6d68095a852a622627d94c1625a728b7f6baff98
  1. .prebuilt_info/
  2. 1/
  3. current/
  4. OWNERS