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

Change-Id: Icf5f5288b4a5e9c41b7a5c28c4a79ffdb6650006