Add merge_ota to otatools am: 792dfa53 am: 8d55887f

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



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