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

Change-Id: I4387c7a7ba6e41541bcedf5a1fd5bb8ceb04e988