Merge "Allow android.hardware.tv.tuner V2 to be used" into udc-dev