[automerger skipped] Merge "Make MTE tests pass with all values of MEMTAG_OPTIONS." into sc-dev am: 1986e6b936 -s ours

am skip reason: Merged-In Id80301e6426af16f89bd80a7a7ab127b6fd60425 with SHA-1 53df1f3772 is already in history

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

Change-Id: I69e5915cad140bfd0c90b398d0bc5d8d181c1012