Merge "Revert "Revert "Avoid adding region space bitmap to heap bitmap"""
am: 8d3ab9c0b9

Change-Id: I29793ba110e36ed04ab31980e91a7584d60297ce