Merge "Remove java/security/KeyStore/PBETest.java" am: 4e68c6cfa8

Original change: https://android-review.googlesource.com/c/platform/libcore/+/2054048

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