Merge "Don't include ScreenPinning test on auto" into lollipop-mr1-cts-dev am: 70649a6f9e
am: 8d90ef5576

Change-Id: Ifd9c60909c3a9ce7c5dfad61dcb7a451028cef40