Merge changes from topics "soong_ab_partitions.txt", "soong_otakeys.txt" into...

Merge changes from topics "soong_ab_partitions.txt", "soong_otakeys.txt" into main am: 7b17361d am: a1a891e1

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



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