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

Change-Id: I2e17039e38ab9367fc42ed874e23c8b781c0d7d1