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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5b7ccf5be5573f0079f19caa7719bfcc37f440cd