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

Android security 15.0.0 release 7

* tag 'android-security-15.0.0_r7':
  Fix type confusion in avdt_msg.cc
  Backport regression fixes for 288144143

Conflicts:
	system/stack/btm/btm_ble_sec.cc

Change-Id: I31dbca6edbd0b8181a83e275f510dfe752a54e74