Merge "ClatCoordinator: wrap clatd information" am: a59eec920c am: 594085e774 am: f5549f8a64

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

Change-Id: Id2899e4af43d66065b7b3e3b51a772bedc3fab34