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