Sony battery fixes
Couple of commits to make the testsuite run on Fedora 33.
The first one is not really required per se but should allow to more clearly understand the issue if it ever happens again. The second patch is the actual code fix.
CC: @roderick.colenbrander for the Sony part, and @whot for the udev