Merge "Make MemoryDealer::deallocate private" am: cdb2c8f355 am: ebae424d21

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1843873

Change-Id: Ic171c21c6a4d6c04737073b250411429e3b9f472