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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I34799d5a4dc9172b69d0d21400e21f8c5a698bdc