Merge "Clarify meaning of --port flag" into main am: a1133e904c

Original change: https://android-review.googlesource.com/c/platform/development/+/2656751

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