Merge "[GWP-ASan] Use new GWP-ASan android_mallopt()" am: a50c4137e3 am: 65b39e8f66 am: a94d0a79ce

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

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