[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: e401f9f8 -s ours
am skip reason: Change-Id I31af865326e9a69042e5c53b63637b95d6de9ad1 with SHA-1 fb10b6b5 is in history
Change-Id: I7ecb28ba392488fe1ea92537ebf79b91391d0d1b