Merge "Mark DemuxCapabilities @SystemApi"