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