Merge "Remove Q support" into main am: be1f0f8ba3 am: 274639ef88

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

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