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

Change-Id: I83fdf816c698b5e50a4aafe2e5931a6c093d655c