Merge "Encrypt LE link immediately on reconnection" into tm-dev am: 3e5357bb...

Merge "Encrypt LE link immediately on reconnection" into tm-dev am: 3e5357bb am: 04e5e220 am: 7f373e0f

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



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