[automerger skipped] Temporarily disable failing HeadsetServiceAndStateMachineTest am: 46013104 -s ours

am skip reason: Merged-In I8be0a5bcbb8c26e3ef178bcb25973783045b9f31 with SHA-1 95216457 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/23566096



Change-Id: I38e50423f90b9dbdc04d0bbf6f258c4aa3f97992
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: b8b0a3ad -s ours am: 73ebbb62 -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/23559922



Change-Id: I828711ee4ce663cf840938093409478c44e7aeb9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 95eaddaf -s ours am: b91a71e2 -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/23559922



Change-Id: Ia9a5ed95c228e56cdb739aa588fe340590108f6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 31d22997 -s ours am: 87633f73 -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/23559916



Change-Id: Iae826a3fd059153fcc9c9872843cf3471a4e62f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: e5f6f748 -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/23559920



Change-Id: I5c630e3aa7588c87c1871c7d44cefa454aadec22
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/23559920



Change-Id: I51c664edb741f610a45a2c7201021532c7031bc2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/23559594



Change-Id: If696a7a5917fe9591bb3abe9e939cd25283314dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: b8b0a3ad -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/23559922



Change-Id: Iadc862a36451c804f6ca85976ffeff21755715c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/23559922



Change-Id: I6277f8bba007000e6b5ba052a438053aa2d380a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/23559916



Change-Id: I92cf3f715f8f02fccb6128a78a8512a5f185cac0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: b8b0a3ad -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/23559922



Change-Id: I974073239186f89fd6f79907e5e3bcef8ce6c1bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/23559922



Change-Id: Idcb2198cb71d8aef6d0b1dcb6f77c5f6059128de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/23559916



Change-Id: I03783f80363487404606f56b295dfd2592aeae7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Test: atest BluetoothInstrumentationTests
Bug: 271351629
(cherry picked from https://android-review.googlesource.com/q/commit:95216457f02bb074eddf40322337f70dfa2d4e1c)
Merged-In: I8be0a5bcbb8c26e3ef178bcb25973783045b9f31
Change-Id: I8be0a5bcbb8c26e3ef178bcb25973783045b9f31

Auto-generated-cl: translation import
Change-Id: I6a9bd036dad568d53fa671de675c613c30c88167

Auto-generated-cl: translation import
Change-Id: Ie65cad9714af781c2e273478bede69898c31496b

Auto-generated-cl: translation import
Change-Id: I0a8497b6e6dee08ae410ac9a843bfd04831ea68f

Auto-generated-cl: translation import
Change-Id: I2345c2b02fb7b4ebb75c1d012fe77bd0e6fd50f7

Auto-generated-cl: translation import
Change-Id: I6b7d0345a2e5d216cc72a1a62f100776aa8b0189

Auto-generated-cl: translation import
Change-Id: Id287ae242fa9283a9d54fc1f548bdaa299024829

Merge "Fix UAF in gatt_cl.cc" into tm-dev am: 813e5845 am: 91c161a1 am: 6c4ef160 am: 60d872c1

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/22581496



Change-Id: I157779a1a36195eb1e76c7da6ffe872065fdd82c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/22581496



Change-Id: I4402f4b85f73f7d42fc1f77aae10e53048e9c722
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/22581496



Change-Id: I5597fce8ab90279bd9ce97c05f379e3a4382ebc1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/22581496



Change-Id: I89af4509c56b2c6c8c836e14e004209314abb38b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/22581496



Change-Id: Ia35254cb60c07929aedf586fa0eb77e2ffa4aeb6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/22581496



Change-Id: Ib7c9450d1ead66dd16c00ae3591c2c7efc7b7a7f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/22581496



Change-Id: Ifa90b6b0ea82c0e6c2017c3782505c16d0967ae7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

* changes:
  Reject ANDROID AT command if the first param is not String
  Reland "Refine AT command of BluetoothSinkAudioPolicy"
  Clear identity bit when passing address to filter
  Keep the IRK when the scan is finished
  Enhance CLCC inference
  Display Bluetooth Disconnected Message
  Add init_flag for SCO LC3 codec
  Log bluetooth state change in metrics
  Add flag for asha_phy_update_retry_limit
  Add ASHA packet drop frequency limit
  Break out stack::include::smp_status.h

Auto-generated-cl: translation import
Change-Id: Ic9b3da80409239d86a8ca68e3d270bc31b5100b8

The first parameter of ANDROID AT command indicates "type" which should
always be String.

Bug: 283725716
Test: atest BluetoothInstrumentationTests
(cherry picked from https://android-review.googlesource.com/q/commit:e255fcf5ed395b47c0baf8086ab896345bc3ae8d)
Merged-In: Ic7d11cf33562ccfca8321cdcfa0e4163614c4e0a
Change-Id: Ic7d11cf33562ccfca8321cdcfa0e4163614c4e0a

This reverts commit d6c1f9af.

Reason for revert: b/283725716
Bug: 283725716

Change-Id: Ifd8d19c44f4b0fbfd9b7a88819409d7a8da15336
Merged-In: Ic7d11cf33562ccfca8321cdcfa0e4163614c4e0a

Legacy stack kept Identity Address Type without the identity bit set.
It is later passed without any masking to "Add to accept list", "add to
resolving list", and VSC filter command. All these commands specify that
the identity bit should not be set in related specifications.

This is a CP with partial revert of aosp/2030646.

Test: manual test with DCK application
Bug: 201255908
Bug: 280811285
(cherry picked from https://android-review.googlesource.com/q/commit:081966285a12d053e1410868afef4edb575a2fc8)
Merged-In: Id68e81a6706ac40d7394e2803ec3339a7bc44a0a
Change-Id: Id68e81a6706ac40d7394e2803ec3339a7bc44a0a

Bug: 201255908
Bug: 280811285
Test: manually tested against phone with sample IRK scanning app
(cherry picked from https://android-review.googlesource.com/q/commit:fe2d40d739f225cdef2bcae2666f40977ebdb1e6)
Merged-In: I58f8caf2c29bf2b12db2e595d42295b65dc4fa13
Change-Id: I58f8caf2c29bf2b12db2e595d42295b65dc4fa13

sort CLCC response by index
add null check
clear inference when conference call children arrive
clear inference when parent call ends

Bug: 262199042
Test: atest com.android.bluetooth.telephony.BluetoothInCallServiceTest
(cherry picked from https://android-review.googlesource.com/q/commit:de135fd4c6a1ed974314a48f5346bfb7750b81c4)
Merged-In: I35d2f8569af1deb13b830a1f23ec540679435233
Change-Id: I35d2f8569af1deb13b830a1f23ec540679435233

The goal is to communicate an error state which indicates that Bluetooth is disconnected. The pop-up that prompts the user to connect to Bluetooth does not appear again on re-entering the app after it has been dismissed. This has been fixed by creating several statuses which
indicate error conditions, download pending or success statuses. The
specific status NO_DEVICE_CONNECTED will allow for the "Bluetooth is
disconnected" message to display by returning a null result.

Tag: #stability
Bug: 275561845
Test: atest AvrcpControllerTest
(cherry picked from https://android-review.googlesource.com/q/commit:13f31c651f782cdd2c6f068013f50fce58c124fa)
Merged-In: I6fb279d49db4d6cdbc0850a684a22033390b557e
Change-Id: I6fb279d49db4d6cdbc0850a684a22033390b557e