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

Change-Id: I80672a9dd9ae990e80db12bded3ceb83a97b4826