Merge changes from topic "preparation_fork_clatd_from_system_server" am: 43f9729e90

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

Change-Id: I5f26eaaf16faf055a63cdd1b2bb4a973c20317c0