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

Change-Id: I4abc6cd03993383c0ace610a6c70b6a72b41e065