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

Change-Id: I669aa5012a93c70b7ee7af7c1958159d933b4f4c