Merge "Add support for reuse configuration in OTA generator." am: 097e8c0a15

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

Change-Id: Idb3bc4cbff66d8bd9c410cf5225bb9c1f7dac04a