Merge remote-tracking branch 'aosp/oreo-mr1-security-release' into lineage-15.1

* aosp/oreo-mr1-security-release:
  DO NOT MERGE Separate SDP procedure from bonding state (2/2)
  Revert "DO NOT MERGE Separate SDP procedure from bonding state (2/2)"
  DO NOT MERGE Separate SDP procedure from bonding state (2/2)
  Make sure server response doesn't exceed maximum allowable length

Change-Id: Ie19a3278a18a9d6bdabc8a80e299d2fb44842080