am 67e02e60: Merge "Fix issue #22487155: Device unresponsive (deadlock in system_server)" into mnc-dev

* commit '67e02e60ca58db95b397fde7bfeeebb012e8aff8':
  Fix issue #22487155: Device unresponsive (deadlock in system_server)