Merge "Improve PackageInstallerService.writeSessionsLocked lock hold" into main