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

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

Change-Id: Id2c877c087b5b46ccefd179a83a2009edce5cace