Merge remote-tracking branch 'goog/upstream-pixel18' into ota-rc8

* goog/upstream-pixel18:
  keymaster: abort operations on HAL errors

Bug: 116055338
Bug: 113354499
Test: release tests pass
Change-Id: I788fbbb1ddbbb498e22c387f688caf1c07b1bb42