Merge "Disable heap pointer tagging on Q or earlier." am: 372a9b99e2

Change-Id: Id3705a9e0b5d9cc732aac405fa1164c65f7fd7ff