Merge "The widget test screen getting clipped." into oreo-mr1-cts-dev am: c6675dc0d6 am: 46a75b08ba am: 4f569096c8
am: 50e9a656d5

Change-Id: I2722309ccc894fdecc572157be32e575c19ed30e