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 am: a3548ed5

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



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