[automerger skipped] Merge "Revert "DO NOT MERGE Verify that remote exceptions...
[automerger skipped] Merge "Revert "DO NOT MERGE Verify that remote exceptions will not cause object leaks"" into oreo-cts-dev am: e3b795d3 -s ours am: b4d9ee32 am: 1373a4c4 -s ours
am skip reason: skipped by user jpsugar
Change-Id: Iec7a87dbe670ca0fe2c6328c8b495d8d7edcea16