Merge "Add include for connectivity parcelables" am: 2b5bb0e665 am: d5b5d8405b

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7ae5493a09dc0461dd00fa710877b73cb769a066