Ensure inquiry is always stopped before service discovery

Service discovery cannot be initiated when the dm search state machine
is not in idle state. This patch ensures that service discovery is
always cancelled regardless of the current state of inquiry.

Bug: 27368986
Change-Id: Ib83d4c8d389e50a1c65e52b343f4996455747836