Merge "Use pid and uid for getCurrentTvChannelInfo"