Merge "Refactoring the Dvr data flow tests in the Tuner VTS" into rvc-dev am: 5a49885b8c

Change-Id: I411b4c03bdc5f92b7117081ac7c1f7d4c47d27f0