Merge "Require a mode, and take config as positional argument." into main am: 182dacc4ac am: 8ced7b2722 am: 44d5b6eca4

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

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