Merge "Default test setup to single column shade" into sc-v2-dev am: 49571aa8 am: c30c8bd2

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15515065

Change-Id: Ia955b757206397fe70918482c9ee384d3f1fd6a2