Merge "Fix deadlock in AcitivityManagerService. am: 67e05b4d28 am: 44c9e2f4bf" into nyc-mr1-dev
am: 8402a17417

Change-Id: Ia085a05cebbc91edb0467edef72afa08c83287c4