Fix deadlock in AcitivityManagerService. am: 67e05b4d28 am: 433a36e9df
am: 6b2a372d62

Change-Id: I5588d6f29331a355856500eda07d9ab9d2ad5876