Merge "LazyServiceRegistrar: Use defaultServiceManager" am: 7f9edd9bff

Change-Id: I1e7aea8ed8a1125f67d5020f9074cfb3ab5d7240