Merge "p2p: add new API to indicate Content Protection support status"