Merge "Keystore 2.0: Remove Keystore 1.0 SPI with all remaining references" am: a8b1b1a2e6 am: 08945c21ef

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

Change-Id: I9efb4419a7dac6e1bb7d99f31e7776759cea9491