[automerger skipped] Merge "identity: Fix uncompressed form encoding of P-256...

[automerger skipped] Merge "identity: Fix uncompressed form encoding of P-256 EC Public Key." into tm-qpr-dev am: 619befaa -s ours am: 21d99f84 -s ours

am skip reason: Merged-In I9a8a5570fde5a80f74632606126cdfcc1f6c7c99 with SHA-1 dc379a45 is already in history

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



Change-Id: I0a34e6f12b2529e3a8d190ad8efde30d93396b98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>