Merge "Include allowChannels info in DNDPolicyProto output." into main