Merge "Allow alternate golden images for TestWithGoldenOutput" into main am: a2d6a9ed28

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3367780

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