[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 am: 16c8780e -s ours
am skip reason: Change-Id I31af865326e9a69042e5c53b63637b95d6de9ad1 with SHA-1 39a57218 is in history
Change-Id: If9b806a5b36da853cbfcbb9fc9e851d1843a8601