Encrypt AES-256 keystore master keys. am: b951bc5317
am: 1bf93470ed

Change-Id: Iee2e907795de09dfd49312ecc845a6a107a996a1