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

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

Change-Id: I526eaf9d04283e705da0024395adf52354a31f1c
Signed-off-by: Automerger Merge Worker <[email protected]>