Merge "libfakeservicemanager: thread safe" into main