tree 0f34ba51d12cc3e8ecd5a2761323ac0261718b85
parent 40413fbd4e5e1a4f4bd6cb7beecd69dc8d4629e8
parent 36eff124994c39ab98817a4de482f1bdbd9a3272
author Maciej Żenczykowski <maze@google.com> 1643160221 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1643160221 +0000

Merge changes from topic "preparation_fork_clatd_from_system_server" am: 43f9729e90 am: 74fe555a17 am: bb4afc3167 am: 36eff12499

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

Change-Id: I107ea47641dd192b2ffe984088b2f386d04f835e