Merge "Add an option to move 16K ota to vendor partition" into main am: 85c79a3a

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



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