Merge "Fix deadlock in AcitivityManagerService." into nyc-dev am: e70ebd694b am: 2046f3f621
am: f3c46a1aa0

Change-Id: I32d07a9eea94b32106b2e2c077c21aa68e8f2142