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

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

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