Merge "Simplify MemtagNoteTests" am: fe8e5ad222 am: abdc85bf5f am: efe8a1b789 am: 2607a156aa am: 7c599915f9

Original change: https://android-review.googlesource.com/c/platform/bionic/+/2636749

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