Merge "Add android.hardware.tv.tuner feature"