Merge "Merge "ServiceManager: waitForService uses allowBlocking" am:...

Merge "Merge "ServiceManager: waitForService uses allowBlocking" am: b801a513 am: 726c374f" into sc-dev-plus-aosp am: 578d06c9

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

Change-Id: I3ff40e03dff825dad6b890a5cea45bcb72211319