Merge "[SB Refactor] Migrate the wifi location-based VMs to use `by`." into udc-dev am: f4253161 am: a0fbaa5c

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



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