Merge "Remove Q support" into main am: eb2cfbbcc9

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

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