Merge changes from topic "am-1f62af788801476da132d12378d218d5" into main

* changes:
  [automerger skipped] Merge "Revert "RpcServer: let system allocate vsock ports"" into android15-tests-dev am: d0469c5 -s ours
  [automerger skipped] Revert "RpcServer: let system allocate vsock ports" am: 5f1ffcb -s ours

Author: android-build-merge-worker-robot