Merge "ART: Clear any exception after resolution"
am: 3a4f5f3393

Change-Id: I5ef2218e13becf555b0d0055585f8aaa41ab3983