Merge "Prefer the VCN subscription when filtering for CBRS" into udc-dev am: 541ef6fb

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



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