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

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

Change-Id: Ibac408578db2f9ecceaffe23e9c4d22850e080e8