Merge "Resolved UAF issue in RefBase fuzzer" am: 9a79c84499 am: da2960df35 am: 5a8869456e

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

Change-Id: Iac76b32d88a3618434669f6b1e00c3591340c849