Merge "Generate incremental OTAs for 16K/4K boot option" into main am: bf25b080 am: 8a627f0a

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



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