Merge "Require a mode, and take config as positional argument." into main am: 182dacc4ac am: 7277d16a41

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

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