Merge "Add clatd binary to apex" am: bb766e83c3 am: 255f7a2a09 am: 1d268ed144 am: 6d5ea2e561

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

Change-Id: I233f9df56f286c8ceb3cc215c89cbe8047bc0dad