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

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

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