[automerger skipped] Remove tabs that have been removed downstream am: 7327f2cc1f -s ours am: f2ce56aab2 -s ours

am skip reason: Merged-In Iaa1207799a44ab892dc30b55f363c6e7deb94d86 with SHA-1 a0c49bcc2c is already in history

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

Change-Id: Ibb62d25a4502d555d2c4d9fb95802d26f4e2aa09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>