Merge "Fixed not mapping sdk_sandbox key to vendor key" into main am: 7cd5b313f6

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

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