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

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

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