Merge "Introduce HdcpCheckingPreferenceController"