Merge "Merge "Fix a deadlock between WindowManagerGlobal and WindowManagerService" into qt-dev am: 99d4417d4f am: 2ab464988f" into qt-r1-dev-plus-aosp
am: 5ca21c63b2

Change-Id: Ib0533e27590ce752da7b79ea519567f3b4f2d676