Merge "Add android.software.live_tv feature" into lmp-dev