Merge "ServiceManager: waitForService uses allowBlocking"