Merge "Fix Rootcanal extended inquiry response generation" am: a8276984 am:...

Merge "Fix Rootcanal extended inquiry response generation" am: a8276984 am: 1c985a15 am: b85b4613

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



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