[automerger] Merge "Adjusting ConnectivityScreenOff test for automotive" into marshmallow-cts-dev am: cedcbbd027 am: a61a24a549 am: 99e2455860 am: ce87aabd5d am: 312029ef55 am: e2595a1732 am: ddb5bdb1c3 am: 760489ce64 am: e5024df444 am: f6bb9a9078
am: 62d785d4fe

Change-Id: Ideac191e6eabad8851f6c46d9f2c90b5e90be917