Merge "Merge "ServiceManager: waitForService uses allowBlocking" am: b801a513d1 am: 726c374fa3" into sc-dev-plus-aosp am: 578d06c984 am: 42be3a6439 am: c4a6a59013

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

Change-Id: I3f489bc2722dd824f34fdde997bec08c5193ed01