[automerger skipped] Merge "Encrypt LE link immediately on reconnection" into...

[automerger skipped] Merge "Encrypt LE link immediately on reconnection" into tm-dev am: 3e5357bb am: 04e5e220 am: 7f373e0f -s ours am: bfb5a200 -s ours

am skip reason: Merged-In I8bd0ef5ae1750096fe72feb334022b9895f3b26e with SHA-1 e5e338af is already in history

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



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