Merge changes from topic "revert-2258770-revert-2234606-EANUQCVQLE-JKTVHZZJLQ"...

Merge changes from topic "revert-2258770-revert-2234606-EANUQCVQLE-JKTVHZZJLQ" am: c5762c0c am: 268d9ede

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



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