Merge "Remove Q support" into main am: c4f92aab46 am: a5186cd465

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

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