Merge "Keystore 2.0: Teach keystore to decrypt generic blobs." am: aea5a6bea2

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

Change-Id: I8e172e3b9401c345a3f13f7d06d1e17975570e1b