Merge "add additional logging to ActiityManagerService" into nyc-mr2-dev am: 0b7b79a882
am: d8ecc93ca0

Change-Id: I89b73e795813f4ed251b8612d9058c5d20c30841