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

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

Change-Id: Id720629612f67560e57ddc0d787ee6314dbbf999