Merge "Add batch generation to OTAGUI." am: 2e1cfae4fd am: 2f8719ccad

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

Change-Id: I8a58ce94715ee7034827c6a4bf0b6e0a0f60edd7