[automerger skipped] Revert "RpcServer: let system allocate vsock ports" am: 5f1ffcb -s ours

am skip reason: Merged-In I2eec99a8e8f894546e025455cc0c5eb58962395f with SHA-1 8433c50 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3387483

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

Author: Steven Moreland