Merge "Prefer the VCN subscription when filtering for CBRS" into udc-dev am: 541ef6fb am: 524e9c6f am: d7972cc1 am: 37e4a7be

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22889527



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