Merge "Curve 25519: Support use via Android Keystore provider (part 1)" am: bab26cc607

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2015496

Change-Id: Ib525665355fd00c56461f8f513cecb9ab41d0552