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

Change-Id: Ic6bc3ccc2b904f4797edadc3b27645de8420f14d