Merge "[Telephony Mainline] Make ServiceRegisterer static"