Merge "emulator: use 5.4 for sdk_phone_arm64" am: 9fe3e4f5b2

Original change: https://android-review.googlesource.com/c/platform/development/+/1494658

Change-Id: I508e270379b44d583d79f59ebab3750fe522fdaa