Merge "Fix equals and hashCode APIs on TvTrackInfo" am: 2e8d16f714 am: 7e6df33644

Change-Id: I5ce9341c0c09ebd017fe718fb54d4824aaa3923b