Merge "Don't call ActivityManagerService on main thread" into qt-dev
am: 9a01bb4280

Change-Id: I8cf6502fe286dc37846f373a35b94f18a977f04e