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

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

Change-Id: I065c85116a4926d89eaaee999c3d0c331702f3c7