Merge "LazyServiceRegistrar: Add flag to prevent shutdown" into rvc-dev am: b9d5afa5e3

Change-Id: Iaaf3d1a20431780b8ee46ce5239bccb2784ed022