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

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

Change-Id: If102aebc06fdbec46f57f916e982ca482ed5cecd