[automerger skipped] Merge "Remove rfcomm_security_records map, store records...

[automerger skipped] Merge "Remove rfcomm_security_records map, store records in tBTA_JV_PCB instead." into tm-qpr-dev am: 28d2f42b -s ours am: a477c125 -s ours

am skip reason: Merged-In Iae24f07fd5d19f66126abfe61052fab96d1b1bdf with SHA-1 34e42ab4 is already in history

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



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