[automerger skipped] Merge changes I49269a50,Ic4731fbd into tm-qpr-dev am:...

[automerger skipped] Merge changes I49269a50,Ic4731fbd into tm-qpr-dev am: 84336e04 -s ours am: 267c0ddd -s ours

am skip reason: Merged-In I49269a504fc423d03826657ad363cfe9ca09bfcd with SHA-1 49fe7aca is already in history

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



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