Merge "[CTS] Fix oom catcher to remove false positives" into oc-dev
am: 2b552bf7d6

Change-Id: I6b8ae456110db5e84750188aa45606a010edd488