[automerger skipped] Merge "log when waiting on a servicemanager" into rvc-dev am: 76ad0655bb am: 16c8780e85 -s ours am: e401f9f8cb -s ours am: b094bf54e5 -s ours

am skip reason: Change-Id I31af865326e9a69042e5c53b63637b95d6de9ad1 with SHA-1 fb10b6b588 is in history

Change-Id: Ibb1a4d02d6d3209d238911378e44e366e4480492