Merge "Merge "Allow ParseOptions to compose multiple option parsers easily"...

Merge "Merge "Allow ParseOptions to compose multiple option parsers easily" into main am: f0e5c7e3 am: ed642d01" into udc-qpr-dev-plus-aosp am: 87b06e5a

Original change: https://android-review.googlesource.com/c/platform/build/+/2828702



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