Merge changes from topic "b/226693442" am: a194e0b5

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



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