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

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



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