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

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

Change-Id: I8897e59a5aa26b051d021c1c6858da15cd2d0207