[automerger skipped] Merge "Factor out duplicate code for parsing gap data"...

[automerger skipped] Merge "Factor out duplicate code for parsing gap data" into udc-dev am: d392ec02 -s ours

am skip reason: Merged-In Ia39886c415218353b6f9d59d7d3f6d1160477d6c with SHA-1 ac5ccf4c is already in history

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



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