Merge "Create defaults to aosp-main instead of master" into main am: ca2f8151e3 am: 500b39c1dd

Original change: https://android-review.googlesource.com/c/platform/tools/acloud/+/3272711

Change-Id: I703cba27771d62aa78f7cd3621a557960be0b0af
Signed-off-by: Automerger Merge Worker <[email protected]>