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

Change-Id: I4c2ae265915d124a8b28ef73063a735ccf524fbd