Merge changes from topic "topshim_security_api" am: 4d04803f am: 5b5a36ad...

Merge changes from topic "topshim_security_api" am: 4d04803f am: 5b5a36ad am: 2505a42e am: 9397b3c2

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



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