Merge "libbinder: add hints to waitForService error" am: ea8305102a am: c82f392575

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

Change-Id: I254771af063a82191c93dc2de6175ea43c1dfc47