Merge "lockmanager: tweak FSLockManager permission handling in doSingleLock()"