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

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

Change-Id: I2b397e8a4f48500d5fde14becca008e5a6c191f5