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

Change-Id: Id27dbd4cca87a6f96fed5dfe078419d4f720bd20