Merge "Fix deadlock in AcitivityManagerService." into nyc-dev am: e70ebd694b am: 91064a0ed3
am: 729759f8c9

Change-Id: Ib6e8748b5c55a2a4b13806cf8439789fa2744a90