[automerger skipped] Merge "Keystore 2.0: No longer install the legacy...

[automerger skipped] Merge "Keystore 2.0: No longer install the legacy provider." am: e72a7b4f am: 02ee21ec am: d27fb109 -s ours am: 579d132d -s ours

am skip reason: skip tag Change-Id I0d71d3c9cdd586a508827eb26120c872cb8643ea with SHA-1 d2d4c69a is already in history

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

Change-Id: Ibbec363017dfb40c695f00bb23d5db9c4ada2b82