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

* commit 'd105c6f6264120bd113d03d0dd27c86674bf5558':
  Reland "use HW Keystore"

Change-Id: I044b668e6c1c4dc8329245d13b250489d25a57af