Merge "Keystore 2.0: Reduce sqlite cache to 0.5M" am: 0df926098f am: 3b5acc5f94

Original change: https://android-review.googlesource.com/c/platform/system/security/+/1699033

Change-Id: I37e3d2c58174101ebdf933a9e0a12c7e22e537f2