Merge "ServiceManager: waitForService uses allowBlocking" am: b801a513d1

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1793027

Change-Id: I18fff5e8d3e5c7e308b218ab95450f9a10593d38