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

Change-Id: I06e08b8c2b1e970bab01d8a12c6ca1e4e46afacc