Merge "Fix NativeAllocationRegistryTest" am: d386b1c96f

Original change: https://android-review.googlesource.com/c/platform/libcore/+/1699345

Change-Id: Iab86598ccfce7e65732c311296993295c2ac9e9e