am 5e8a63ae: Merge "ART: Do not recursively abort when visiting locks in a bad state" into lmp-dev

* commit '5e8a63ae39cb5db996229c6c4a1a21a4b8dec5a2':
  ART: Do not recursively abort when visiting locks in a bad state