[automerger skipped] Merge "Upgrade emulator to emu-master-dev build 6946397" into rvc-qpr-dev am: d75a457e03 -s ours

am skip reason: Change-Id I784438f15a28514c56bf50d15dba6a12b7f40a1e with SHA-1 d971c541c5 is in history

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

Change-Id: I2983ca383b414b8ef228e84d3366a7743cd977db