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

Change-Id: I448217399ba99af0e1af8f822c86542b6bcd47e2