Merge "Add new Android Keystore algorithms." am: 9c0871c77b

Original change: https://android-review.googlesource.com/c/platform/libcore/+/2011595

Change-Id: Ia36142041e19bcad67ec7bc7f0398d84d5edef35