Merge "Remove Oom Catcher" into qt-dev am: bd25fe50cb am: 65b350a562

Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/13791493

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I77340f4f5602caef617d85fa76bf17bdcc824ce4