Merge "CTKD from LE to Classic stability fix" am: f8b7f344 am: 117780c9

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



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