Merge "Update MemoryHeapBase to avoid abort" am: a58f610c am: b250bafc am:...

Merge "Update MemoryHeapBase to avoid abort" am: a58f610c am: b250bafc am: 75f2cfd1 am: d167ea3a

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



Change-Id: I540dcf943b27d5e26bb91d3a5000d83cabbe5187
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>