Merge "TIF: Add test cases for TvContract.Channels and TvContact.Programs.Genres" into lollipop-cts-dev