Merge "Clarify meaning of --port flag" into main am: a1133e904c am: ead6b15f2e am: 89db468a4e am: 0469b6bc43

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

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