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

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

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