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

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