Merge "Add a test app for suppressed exceptions" am: 15c6078f4d
am: 166ab31073

Change-Id: Icff43af8769359b3cc97653182831466a02b0c8f