Merge "keymaster: avoid deref'ing nullptr" am: 1e4630d844 am: a05e847177

Original change: https://android-review.googlesource.com/c/platform/system/keymaster/+/1555467

Change-Id: I3bae67946c060171b839f1c1a1cdc0af49b830eb