Merge "Add support for non-A/B OTA package in OTA_analysis." am: cda807f661

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

Change-Id: I480d21ec830388b79871414cb83acc526b6ad206