Merge "Revert "Support incremental dev option OTA during signing"" into main...

Merge "Revert "Support incremental dev option OTA during signing"" into main am: dbba0643 am: ad531c35

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



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