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

Change-Id: Ic74218678f92227f99f780cb5aee6526344bee6d