Merge "libfakeservicemanager: no hold lock in clear" into main