Merge "Minor refactor for updateSourceMetadata and updateSinkMetadata" into...

Merge "Minor refactor for updateSourceMetadata and updateSinkMetadata" into main am: 94789391 am: af892daa am: 63630a05

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



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