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

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

Change-Id: Ia596d71f59c1e874abc42bed35098e15580b1f14