Merge "Add Demux and Descrambler interface to Tuner HAL Test: Manual bug: 135709729" am: 7048f252cf am: f01ab481f7 am: 900574b220
am: e851be506e

Change-Id: I368401c7ce4b82788ccf7e135cb695ce91282be3