Merge "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 am: 5679c755aa" into oreo-cts-dev am: a3f6e37ea5
am: 21df4fbf4a

Change-Id: I3008b6283ea8a695d64b51f6eb02ab355d33e062