Merge "Fix exception spam in ActivityManagerService." into nyc-mr1-dev am: f6fcb7b77d
am: e4ff55a10a

Change-Id: Ieab9f9a25d4f40e34b340d4eec68045c977d2323