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

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

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