Merge "Remove unused methods from android.security.KeyStore" into main am: c264cd5c43

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

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