Merge "Keystore 2.0: No longer install the legacy provider." am: e72a7b4f1b am: 02ee21ec65

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

Change-Id: Iefd5dc2e56ab8976b9f95db88340bd0cc705cd73