Fix exception spam in ActivityManagerService. am: feb846c299
am: 76ac2e7a8b

Change-Id: I6701526c571967715064cc366f032d0a284a7b35