tree f5aee823e291074a92ab399e2429a4587ccc9e14
parent 723fdae2a5ce191ad8c35fd9b04c2c76ae844f8f
parent 6ce73846c4132fa309c20a1f128298c7468d706a
author Treehugger Robot <treehugger-gerrit@google.com> 1633998639 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633998639 +0000

[automerger skipped] Merge "Revert "Move all BluetoothCodecConfig and BluetoothCodecStatus APIs moved from"" into android11-tests-dev am: 6ce73846c4 -s ours

am skip reason: Merged-In I29983284b1a1c271d983c99b286e204604abdc72 with SHA-1 57835f979c is already in history. Merged-In was found from reverted change.

Reverted change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1443487

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1449263

Change-Id: I49ca9a625eeb097c1a69ee9ff02934d892537e15