[automerger skipped] Merge "Revert "RpcServer: let system allocate vsock ports"" into android15-tests-dev am: d0469c5 -s ours am: c90c0c0 -s ours am: 613e6bd -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: Ib6ae071f0130d9c29a638a1cceb82b170f83545b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Author: Steven Moreland