Merge "devices-8064: Enable Content Protection for 8064." into msm-3.0