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

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

Change-Id: I41d0972b8ef08cb4d305728940c4ea06d918de08