Merge "emulator: packing encryptionkey.img for sdk_phone_arm64" am: 78ba0d950f am: c5fe1428ad

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

Change-Id: I836867cf132978a933284d4eb933ab3237e88095