am 26e98d67: Merge "Fixed android.widget.cts.FrameLayoutTest#testAccessMeasureAllChildren on watches, which have much smaller screens than phones. Bug:15131296" into klp-modular-dev

* commit '26e98d67778c0f4f3e154b0869abbb31e40ed2e9':
  Fixed android.widget.cts.FrameLayoutTest#testAccessMeasureAllChildren on watches, which have much smaller screens than phones. Bug:15131296