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

Change-Id: I9b75016ac643c5bab03589ec82a4946fc2d9720e