Merge "Adjusting ConnectivityScreenOff test for automotive" into marshmallow-cts-dev
am: cedcbbd027

Change-Id: I35dbc6c2e59a0a02c51ff6b132ac61a90498cf4f