Merge "Merge "Don't call ActivityManagerService on main thread" into qt-dev am: 9a01bb4280 am: 545cc77897" into qt-r1-dev-plus-aosp
am: e8fdc6472c
Change-Id: I25f0b265b18089c921c410d54da6393480af5b23
This commit is contained in: