am ec01623b: am aeae0f38: Merge "Add asymmetric crypto constants for AndroidKeyStore API."

* commit 'ec01623b0b456c9e8f43123f1f96fb2330a6615f':
  Add asymmetric crypto constants for AndroidKeyStore API.