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

Change-Id: I5d1ee1626bccfa3b755498c34f59c3be166ed4fa