[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: 1da44136 am: b8f7bbaf -s ours am: 2b30cd5e -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: I2d3fefb8bbd20b3c584db0e695e8fd9c324eb00a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>