[automerger skipped] Merge changes...

[automerger skipped] Merge changes Icee2a268,I41039994,Ibe6d9844,If25bcd20,I2f7b72da into tm-qpr-dev am: 901ad773 -s ours am: 99d547f5 -s ours

am skip reason: Merged-In Icee2a268faa3cbac4cd0001d09baec82eeb01f9d with SHA-1 7ba9e5e2 is already in history

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



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