Merge "Keystore 2.0: Fix getKey returns null on key not found." am: 2ced350043 am: d07d143e71 am: 63b142bf74

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If9f469174a22c57ab10dbbcb7749894a6f12f450