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

[automerger skipped] Merge "Encrypt LE link immediately on reconnection" into udc-dev am: 551d63c4 am: b27e8f8a am: b3253e90 -s ours

am skip reason: Merged-In I607af8214f4fd9c3905f2e053ba136cd6189361f with SHA-1 829d8981 is already in history

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



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