[automerger skipped] Merge changes Ic205348e,Ibfaf9538 into tm-qpr-dev am: 44ab0001 -s ours am: 1c402946 -s ours

am skip reason: Merged-In Ic205348e45c4b8ecb3889f586d867675f0ce8931 with SHA-1 9275204c is already in history

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



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