[automerger skipped] Merge "shim: Connect le data length change" into tm-dev...

[automerger skipped] Merge "shim: Connect le data length change" into tm-dev am: f71c7d1a am: de41ffbe am: 83dfe1ec -s ours am: ddebeb3e -s ours

am skip reason: Merged-In I923786cff626afe10356b75ff003ad81c5e68ddd with SHA-1 6831090d is already in history

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



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