Merge "gpu: ion: Add scm calls for content protection 2.0" into msm-3.4