am f7e7f744: am a482b046: Merge "Require IND-CPA by default for new AndroidKeyStore keys."

* commit 'f7e7f744e193e027afde5c071889bde1c5882cfd':
  Require IND-CPA by default for new AndroidKeyStore keys.