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

Change-Id: I7429328b775b92664072ab7a585de372be2fcc67