Merge changes I05f3b7e5,Ifcfd0b8f

* changes:
  Request rollback resistance for SP protector keys
  AndroidKeyStore: support platform use of rollback-resistant keys