Merge "use different log.h header file" into main am: 1b0f6fe058 am: a75b433c18

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

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