[automerger skipped] Merge "DO NOT MERGE Fix failed test case when test on TV" into pie-cts-dev am: e4b349cf4f -s ours

am skip reason: subject contains skip directive

Change-Id: I980b40555812dbc605623a8dc0c4fd7f8c0e6895