Merge "Batch fetching of key descriptors from Keystore" am: 2051907a am:...

Merge "Batch fetching of key descriptors from Keystore" am: 2051907a am: 5bb8c65e am: aa945174 am: 6f965bea am: e6d7927c

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



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