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

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

Change-Id: I34f9927fe473a093f8fae27c9bbed48744a08435