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

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

Change-Id: I144782a0ccbdfb7b78ce63db9eec8a71e058de9f