[automerger skipped] Merge "log when waiting on a servicemanager" into rvc-dev...
[automerger skipped] Merge "log when waiting on a servicemanager" into rvc-dev am: 76ad0655 -s ours am: 79aca953 -s ours
am skip reason: Change-Id I31af865326e9a69042e5c53b63637b95d6de9ad1 with SHA-1 fb10b6b5 is in history
Change-Id: I64385a8b96aebed1f4b3e32eeed08547097b009a