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