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

Change-Id: Ic7f5fb51d9d19d512b8021448843039fead15426