Merge "Allow users to switch between FE source and DVR source when testing record/descrambling/broadcast" am: ddafbe597c am: 19746b1629

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1690329

Change-Id: I433eb641c0e0b97874494a7a993076c31a0d7497