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: Id9a0d9fe4279aa8cd9ceafe475be31db5925f495