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

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

Change-Id: I8104370e36210d4d346cdfb67bb7beabb81db7da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>