[automerger skipped] Upgrade emulator to emu-master-dev build 7479360 am: badbe4fde3 -s ours

am skip reason: Merged-In Iaa77e11e26bfb6559c07d7a6886e708ab785ba94 with SHA-1 fac80ebb03 is already in history

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

Change-Id: If4ce8c27115541b62e4f77dba7b20a09ec914f24