Merge "ServiceManager: waitForService uses allowBlocking" am: b801a513d1 am: 726c374fa3

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

Change-Id: I79e5443b356906fcb0787f8c286af7bb520326a1