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

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

Change-Id: I786d5ea22ce912d57e02ada97f4433d7d51617bd