Merge "Keystore 2 SPI: Fix KeyStorePublicKey getEncoded()." am: 9e5385798e am: 050882545c am: a38be41f98

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2aa3d12fc66b123fbba7af6ede0b2a91e159be1d