Merge "use HW Keystore"
am: 8e7c212

* commit '8e7c2122adeaf079c350da315b556c25c50432b1':
  use HW Keystore

Change-Id: Ic290980667a134bc4262b575715b4cccf35c5761