Merge "gn2bp: Fix some protos include_dirs" am: 327b8dd91d

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

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