[automerger] Merge "Merge "Excluding ScreenLock test for automotive" into marshmallow-cts-dev am: eb30239ed6" into nougat-cts-dev am: 6b87d8f716 am: c79b54aa4b am: d7668a0797 am: 8e16b8112f am: 640fe7f4a5 am: 2c4027599a am: ad3f917780 am: 08d32f3d97
am: ff2d5b0735

Change-Id: Idbd8820f9fb383ffa3bd7683a06dcbc7f3b4d5e6