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