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

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

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

Change-Id: I3f489bc2722dd824f34fdde997bec08c5193ed01