[automerger skipped] Merge changes If90c5b77,Iaa66f434 into tm-qpr-dev am:...

[automerger skipped] Merge changes If90c5b77,Iaa66f434 into tm-qpr-dev am: d6c8630d -s ours am: 1ac65e42 -s ours

am skip reason: Merged-In If90c5b7767011ea96300ffd33349d1e342d16cf8 with SHA-1 16fde485 is already in history

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



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