Merge "Add --max_threads to OTA generation" into udc-dev am: b87d46cb1a

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

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