Merge "Remove Q support" into main am: c4f92aab46

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

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