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

Change-Id: I3f1aa0b2f41b7059b61b52f7ceb22e96eb063f40