Merge "Rename instrumentation ExceptionCaught to ExceptionThrown"
am: d98350db5c

Change-Id: Ibf325941eebd7a5fc8ef268f139e0a13d7b7b218