[automerger skipped] Merge "Keystore 2.0 SPI: Fix NullPointerException in...

[automerger skipped] Merge "Keystore 2.0 SPI: Fix NullPointerException in setKeyEntry." into sc-v2-dev am: 50ad58a1 -s ours

am skip reason: Merged-In If3a4bd6677ab3173c5c1a7c921ba567b7981662b with SHA-1 4ff6274f is already in history

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

Change-Id: I5577f11a50b7e98e0f198e734aeef8568c2daedd