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

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

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