Merge "Keystore 2.0 km_compat: Cuttlefish does not return a vendor patch level." am: d644edaa37

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

Change-Id: I64c7aa95b12d5ce3a2c7b4149fe5ec98fbac04e7