Merge "Reland "use HW Keystore"" am: d105c6f626
am: 72ebf11b3a

* commit '72ebf11b3aae78feb1a247e399bd45bcf52a4df5':
  Reland "use HW Keystore"

Change-Id: I2d9e84619b5d58d4c65c2fd4954acbb3563a8e2e