Merge "Keystore 2.0 SPI: Fix installation of legacy Keystore provider" am: 5408268606 am: 3a1c6e6b9e

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

Change-Id: Ie8a914aacb821d409c1b009897d80a8055c04a74