Merge "Revert "Fix MediaDrm security level APIs""