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

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



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