Merge "Fix the TV detection logic for Shadow CTS test" into lollipop-mr1-cts-dev