Merge "Merge "Merge "Excluding ScreenLock test for automotive" into marshmallow-cts-dev am: eb30239ed6" into nougat-cts-dev am: 6b87d8f716" into nougat-mr1-cts-dev