ANDROID: properly backport filelock fix in 5.10.223

In commit 5661b9c7 ("filelock: Remove locks reliably when
fcntl/close race is detected"), upstream the current change was not
present, but it is in our branch due to external changes, so fix it up
to build and work properly here.

Fixes: 5661b9c7 ("filelock: Remove locks reliably when fcntl/close race is detected")
Change-Id: I0ac2c1ab80cfb9f9577d09dbee45d3eb2ac19612
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>