Merge "Have the default JDWP sync connection port be chosen by the OS. am: f29bf6ef am: 48930360" into nyc-mr1-dev-plus-aosp