Merge "Allow merging target files without framework ab_partitions.txt" into...

Merge "Allow merging target files without framework ab_partitions.txt" into main am: 150fbac7 am: 459b05f7

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



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