Simplify router stub registration and unregistration

This is a non-functional change.

Bug: 205124386
Test: Presubmit.
Change-Id: I797a213d1034bd6d2ac58a177a4569ea9142257b
1 file changed