Merge "Add clatd binary to apex" am: bb766e83c3 am: d3a4dc8ee6

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

Change-Id: I64ca9d0df63ace438a24687defdb973d4749b61d