Merge "Remove Q support" into main am: eb2cfbbcc9 am: a5d1b939df

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

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