Merge changes I2234fb01,I87ec83dd

* changes:
  keystore2: Support for RKPD attestation keys
  keystore2: Add utils to fetch keys from RKPD