Merge "Simplify MemtagNoteTests" am: fe8e5ad222 am: abdc85bf5f

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

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