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

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



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