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

Change-Id: I362f9e6b5260e7c050b67b01c0c5b5ec23c226b5