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

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



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