Merge "Ignore deliberate free() of non-heap memory" am: bb03b3626f am: 79ae0e1d60

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1640702

Change-Id: I293271f61e74690aa4cd8b5fdcf9b452dcd79f57