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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id0facd7c3f068f3923887b0484442e09712ef360