Merge "Remove Q support" into main am: be1f0f8ba3

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

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