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

* commit '18587c5511ce3304070d5ac77c112fccdde68e3b':
  Fix issue #22487155: Device unresponsive (deadlock in system_server)