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

Change-Id: I6f95b76d1b36b42f5f5592aac77d1d5dffd3e6e0