Merge "Add DescramberTests in Tuner VTS" into rvc-dev am: b035b6a80f am: 484bbd0755

Change-Id: If85c10f75f03cabb50a905457208860170a2ccfe