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

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

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