Merge "OomConnection: Verify memory listener state" into main am: ffd9e2bb8f am: cd296af4c3

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3007770

Change-Id: I703533e7336d3fb5e19e0a96479288fe1310c724
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>