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: Ieef0f0ce9705830d1bea9a44cd78e893661707f5