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

* commit 'c4a41245a9ef1cef8f26a58e9f119b44486490a1':

Change-Id: Id95748b79303d5aa551d92542d47d369e130a713