Merge "Remove unused directories in Connectivity" am: 381ea1f1b1

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

Change-Id: I2d9d147016b4fc4060a4b04b75a4a00c10876847