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

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

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