Merge "Make NearestTouchFrameTest run on more device configurations" into oc-dr1-dev
am: a083c8f83a

Change-Id: Ic17c6dd90a3ff3acd71885814d447a38b2c7b75d