Merge changes I6f7bb67a,Idb75cbfb,I29c6eeae,I8a23fbc8,I225d01c4, ...

* changes:
  Fold BTA_DmDiscoverByTransport into BTA_DmDiscover
  The extended part of service mask is never used
  mask_ext.num_uuid is always 0
  Remove sdp_search from discovery, it's always true
  Remove hack from I2819702ac068be9515824234e85d81ac2ec7a748
  Minor improvement
  Fix error when converting state machine table