Merge "[CTS] Fix oom catcher to remove false positives" into oc-dev am: 2b552bf7d6 am: 18511c1db2 am: 47e8598893 am: 5bc60e9c83
am: 1aa7d1e504

Change-Id: I3c8af9be57823e0dba530b5436d3220a1558221f