Merge the 2019-08-01 SPL branch from AOSP-Partner

* security-aosp-nyc-mr2-release:
  Revert "DO NOT MERGE Separate SDP procedure from bonding state (2/2)"
  DO NOT MERGE Separate SDP procedure from bonding state (2/2)

Change-Id: I09e0cd01325c40e6864f7b204d6c3dd3c207d1be