[automerger skipped] Merge "Remove unused directories in Connectivity" am: 381ea1f1b1 am: 48181ab964 -s ours

am skip reason: Merged-In I0d4bd06e79adedbf582d2fed551d9f1bde521fd1 with SHA-1 6d09efb7b8 is already in history

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

Change-Id: I7ef63f89795d1b3dbf97c6f0f8bf8d64fc7e46f4