Merge "Remove unused references to android.security.KeyStore" into main am: 9f6d9acba5

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

Change-Id: I1c9781606d6b4559f54ded1b2c7ff03d20d15d9f
Signed-off-by: Automerger Merge Worker <[email protected]>