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

Change-Id: I88fa5340a36dffdddc4280ce8b2d7f0d7de05df1