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

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

Change-Id: I5bba9e752183d83b33bb9ba61bfaaf3c1d845860