Don't use WRAP_CONTENTS in testZoom.

Per API docs update the combination of pinch zoom and WRAP_CONTENTS
is not supported. This change makes testZoom use a MATCH_PARENT
height. This also seems to fix the test which was previously failing
on timing between re-layout and scale updates.

BUG: 10806014
Change-Id: Id849e0f580dd71e6c1596347dc7d3ffe22bdd655
2 files changed