Merge "Add APIs to support granting access to Android Keystore keys" into main...

Merge "Add APIs to support granting access to Android Keystore keys" into main am: 64477772 am: 2966392d

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



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