Merge "Allow extra_apex_payload_key to take multiple names at once" am: d024518e

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



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