Merge "Added missing mGlobalLock in system server" into qt-dev
am: 68423d1491

Change-Id: I0881388643f6b87e12ed4833ee79fede4d43b7a6