Merge "devices-8930: Enable Content protection for 8930." into msm-3.0