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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib908588b11a32b37871ac7e6f7af2e88fc7e887e