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

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

Change-Id: I17449a51b842a1d168b847665aeac8f4bbbc4af3