Hi There. Just wondering if you found a solution to your problem? I have the same exact issue (with my 1994 Camry) & have come to realize that I might have accidentally activated this "feature" when simply opening my trunk. I've been researching all night to figure out what happened to my trunk lock / lever & was previously under the assumption that my lock was vandalized.
Please let me know if you have any solutions. I cannot understand how this feature is supposed to be a convenience when they do not tell you how to revert the lock back to it's normal position.
Also, I do not even know if I have a master key but whatever type of key it is, I was able to lock/unlock my trunk but not my glove compartment, however, that's a whole other issue.
Any information you might have is most appreciated. Thank you.