[automerger skipped] Merge "log when waiting on a servicemanager" into rvc-dev am: 76ad0655bb -s ours am: 79aca9530e -s ours am: eaf2cb15ac -s ours am: 645e6f4cad -s ours

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

Change-Id: I4944788bd9c0063d2ce6207bb6d9452cdb4586b5