Merge "LazyServiceRegistrar: Add flag to prevent shutdown" am: 0d899f6c8a

Change-Id: I222a3bc851bb844d9f8cad6490dfae912c66577f