Merge "mdtp: porting mdtp to msm8996"