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

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

Change-Id: Ie1f717bfc90bc54e1fe309b2b206269069a65dc0