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

Change-Id: Ia184dcde0864a182ea07d115e8cd5a9d7274c9e4