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

Change-Id: Ic982c6c5c3ee71c18748cc1cf70f87a827c0b135