Merge "LazyServiceRegistrar: Add flag to prevent shutdown" into rvc-dev am: b9d5afa5e3 am: 1fa03acaec am: a9cff5f5bb am: 417fd3a106

Change-Id: Iaad10fc2c88d1963ab8eba0c334525b3e578e7df