[automerger skipped] Merge "Add memory OWNERS to JNI" into main am: 5e5cfe6c00 am: 5a35131ad9 -s ours

am skip reason: Merged-In Ida170c1282157db712a4ea811d0429987438c773 with SHA-1 59baf003d9 is already in history

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

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