Merge "Remove android.security.KeyStore" into main am: 0974de2b36 am: 3530c8d029

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

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