[automerger skipped] Merge "Use connectivity aidl-export directory" am:...

[automerger skipped] Merge "Use connectivity aidl-export directory" am: cd055e78 am: b17382ff am: cb2f8529 -s ours

am skip reason: Change-Id Id978db87acf8e2fa558a9039842fedf029eed5fe with SHA-1 e9d9fecc is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia442fa6ea2d13e11a8680a9108ce8122f6e859e5