Merge "Keystore 2.0 SPI: Add CERTIFICATE_* tags." am: 14a82f7983 am: 4b875e5524

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I46e4bf75482d4366fa852ce0708483beddd32fdd