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

Change-Id: Iba0283a27e1dfdfed8bdc120c7165617be976025