Merge "Generate incremental OTAs for 16K/4K boot option" into main am: bf25b080d6 am: 8a627f0a15 am: 3913d54d78

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

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