Merge "clat: enable PACKET_AUXDATA cmsg reception" am: b5cfb6426c am: 2bc0d22736

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

Change-Id: Ia16b2a077b4f5126293bc5d9bcfb970793aa4923
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>