Merge "Fix a deadlock in system server" into nyc-dev am: ab0744344d
am: b223c0c6a6

* commit 'b223c0c6a6aa586941fc0704387a8b1739a44dd2':
  Fix a deadlock in system server

Change-Id: I199e172618b9f9885b03051eb1a8c55ec0af6fd3