Merge "Remove Q support" into main am: 2842b3282d

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

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