Merge "Use ProcessState::selfOrNull in ServiceManager APIs" into main