Merge "[Invisalign2] Separate security related data structure in btm" into...

Merge "[Invisalign2] Separate security related data structure in btm" into main am: f0e5bee8 am: 5dadbe13

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



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