[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: 5c5fe037 -s ours

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/11558282

Change-Id: I9fc27da2a461b41b1350d3b71960c21e012131b1