Merge changes from topic "trusty_qemu_build_11955780" into main am: 6d58a57a90 am: 7b44c78951

Original change: https://android-review.googlesource.com/c/platform/prebuilts/android-emulator/+/3126519

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