[automerger skipped] Merge "Add Demux and Descrambler interface to Tuner HAL Test: Manual bug: 135709729" am: 7048f252cf am: f01ab481f7 am: 900574b220 am: e851be506e
am: 8cc36ea9b3 -s ours
am skip reason: change_id I78283acdd7c22a2d4a785fa050bedd5e7ccc593e with SHA1 f3eec03f42 is in history

Change-Id: I72dc124ecf4123413d5c7c203e11fa90bb2d3ffb