Merge "Change the android_mallopt(M_SET_HEAP_TAGGING_LEVEL) API." am: 69872da21d am: 88249ac6ad

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

Change-Id: Ic583f85b080f96e91432b587174543996882b3ca