Merge "Remove unnecessary Q SDK check" into main am: ca8c295153

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

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