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

Change-Id: Idbe5e2f729b45f9918c7f0a9f16bccf959427dbc