[automerger skipped] Adjust include_dirs for relocated packages/modules/Connectivity am: cdc580e6 -s ours

am skip reason: Merged-In I32bb4b343e25ca8d6f816bcd48a039380ce7bac9 with SHA-1 281d9042 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/14691840

Change-Id: Id59b2452471d7183051f0ca8bd2418277b57f159