[automerger skipped] Merge "Fix crash for getting offload capability" into...

[automerger skipped] Merge "Fix crash for getting offload capability" into tm-dev am: d0a5a350 am: d7e8bd2e -s ours

am skip reason: Merged-In If4f12f14454cea80c0fb25e2376063ee8a06d9c1 with SHA-1 d8042721 is already in history

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



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