[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

Change-Id: Ieda4601ee4ad148985978e5cb53af9fd86672b10