[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: 03ffec7f -s ours am: 7ce44b3b -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: Ifadc8592c0020400d5249b2b2f239055f76a03ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>