Merge tag 'android-security-15.0.0_r6' into staging/lineage-22.1_android-security-15.0.0_r6

Android Security 15.0.0 Release 6 (12895207)

* tag 'android-security-15.0.0_r6':
  Fix UAF in sdp_discovery.cc
  Use encrypted link for avdtp and avctp channels
  Reset permissions for not bonded device
  Fix more memory-unsafe logging
  Fix incorrect logging in sdp_server
  Fix incorrect logging in sdp_discovery
  Remove flags for b#314331379
  Reapply "opp: validate that content uri belongs to current user"
  Fix OOB writes in gatt_sr.cc
  (Reland) Encrypt LE link immediately on reconnection
  Fix "GATT Read Multiple Variable Response" builder
  Fix OOB write in build_read_multi_rsp of gatt_sr.cc

Conflicts:
	flags/security.aconfig
	system/bta/hf_client/bta_hf_client_sdp.cc
	system/stack/acl/btm_acl.cc
	system/stack/avct/avct_api.cc
	system/stack/avct/avct_bcb_act.cc
	system/stack/avct/avct_lcb_act.cc
	system/stack/avdt/avdt_ad.cc
	system/stack/avdt/avdt_api.cc
	system/stack/bnep/bnep_main.cc
	system/stack/bnep/bnep_utils.cc
	system/stack/btm/btm_sec.cc
	system/stack/eatt/eatt.h
	system/stack/gatt/gatt_sr.cc
	system/stack/hid/hidd_conn.cc
	system/stack/rfcomm/rfc_ts_frames.cc
	system/stack/rfcomm/rfc_utils.cc
	system/stack/sdp/sdp_discovery.cc
	system/stack/sdp/sdp_server.cc

Change-Id: I5b091626ecc2068d5f5af67e0277c4e09c2db7a7