[automerger skipped] Merge changes...

[automerger skipped] Merge changes I96f7eb8f,If7629907,Icabe59ef,I8afaaf1c,I0a5ed3c2, ... into tm-qpr-dev am: 36475f25 -s ours

am skip reason: Merged-In I96f7eb8fb3318810d93f740954b78523ffb0a3bc with SHA-1 803062e0 is already in history

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



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