Merge "log when waiting on a servicemanager" am: 377fc5aadd am: 300da2feb3

Change-Id: I105bec8e3badb07f7008a6a9e8071263e2344e1f