Merge "Revert "Revert "Fix MediaDrm security level APIs"""