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

am skip reason: subject contains skip directive

Change-Id: I953471ef73873369c916e2cae5f8b321b5911ac7