Merge "ClatCoordinator: wrap clatd information" am: a59eec920c am: 68f7cc6f1b

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

Change-Id: I9ea5e5cdc04b40a1d0c55dd823967f3f679a7a2a