[automerger skipped] Encrypt AES-256 keystore master keys. am: 58e675567c -s ours am: bf0ed8ba46
am: 6ba5d93f9e

Change-Id: Iad65cc33fb8f6a2dff469c7fb805aefdc55813c3