Merge "Add clatd binary to apex" am: bb766e83c3 am: 255f7a2a09

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

Change-Id: I300255f079a4d71a67672ca1240ac5d482b639df