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

Change-Id: I64ab7142f326d6b652ce08a6ad8dd852de8e3dcc