Merge "[automerger skipped] Merge "Revert "DO NOT MERGE Verify that remote...

Merge "[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 skip reason: subject contains skip directive" into oreo-mr1-cts-dev am: 5a07f70d -s ours
am skip reason: subject contains skip directive

Change-Id: I51132b2d329666afb9c5d63109262b7ac6e39e59