[automerger skipped] Merge "Add encoding information to TvTrackInfo" am: f3681741e3 am: e982fa4084 am: 9764563966 -s ours
am skip reason: skipped by user nchalko

Change-Id: Ibfc92e45b9b1cf22346b198b75611fcb1732de7c