Merge "ClatCoordinator: wrap clatd information" am: a59eec920c am: 68f7cc6f1b am: 9aa93cb67b am: baf6fb2693

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

Change-Id: I0485c30a23601fc35b0e53280219ca16973b23f9