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

Change-Id: Ic2c28cbda4e096ab4a67a6313ac96d90a329b31b