[automerger skipped] Merge "[LeAudio] Add LocalBluetoothLeAudioContentMetadata...

[automerger skipped] Merge "[LeAudio] Add LocalBluetoothLeAudioContentMetadata and LocalBluetoothLeBroadcastMetadata" am: 818bcf35 am: 29a4be82 -s ours

am skip reason: Merged-In I3722ce537cc6e2b8a85d6390a432881e7fccef87 with SHA-1 8764c411 is already in history

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



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