Merge "Merge "The widget test screen getting clipped." into oreo-mr1-cts-dev am: c6675dc0d6" into pie-cts-dev am: aa344971b2 am: ebaf75175b
am: 11f3cceddf

Change-Id: I1f00a000b1076d8626e9d6bae7169bf466ab451a