[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 skip reason: Change-Id I31af865326e9a69042e5c53b63637b95d6de9ad1 with SHA-1 39a57218 is in history
Change-Id: I8c7f1d5f837c6c3eb8561e0bd6452bb4c1cf1615