Merge changes from topic "b/226693442" am: a194e0b5 am: ac286ae2 am: b699d9cb am: 244ce925

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



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