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

Change-Id: I1363402c842b3910febb6f7495eb372680bd053a