Merge "Ensure apps cannot prevent uncaught exceptions being logged." am: f61a449ee9 am: 8431c55fb8
am: 62360649c8

Change-Id: I5ab8894481e32ee2c4f40439d920facd095ac952