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

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

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