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

Change-Id: I472011ba027b2d6b363807cee098e6114c231d38