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

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



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