Merge "Reland Support incremental dev option OTA during signing" into main am:...

Merge "Reland Support incremental dev option OTA during signing" into main am: 7f909229 am: 7575a817

Original change: https://android-review.googlesource.com/c/platform/build/+/3257139



Change-Id: Ie8b1e4c4a964549dbbc383921ec1e1a208fcc1ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>