Merge changes from topic "preparation_fork_clatd_from_system_server" am: 43f9729e90 am: 3723e300fc

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

Change-Id: I9b868679a293e0bc4ec6c57bf6f98fab621ad46d