Merge "Add DescramberTests in Tuner VTS" into rvc-dev am: b035b6a80f am: 1635f9e103

Change-Id: Ic3a092a7b218ab1d258834ae473fc918d4ae2aa5