Merge "Fix typedef retention" into main am: 4de53e2d18

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

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