TV: fix tests to match updated framework behavior DO NOT MERGE

Bug: 18461314
Change-Id: I04761ffccf7b1ddc09207e54ff68f5d9be383dc8
(cherry picked from commit 54f75ef119ebb10289ad02d926becc82c7dcfe17)
2 files changed