[automerger skipped] Encrypt AES-256 keystore master keys.
am: 58e675567c -s ours
am skip reason: SHA1 58e675567c skipped by user swillden

Change-Id: I1101c7778fabc89ebaf3bc44139f15f299d5c7f1