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

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

Change-Id: I2f8efd82483481827aa33425e71cebf727aecfc6