Merge "Keystore 2.0 SPI: Make getAttestationIds return an empty array." am: 1f82f476c0 am: cf64e636a8

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1664321

Change-Id: I7e790f590c81e8d0dcdf9693b9dc23d14f1ff90a