[automerger skipped] Merge changes I96957880,If7fa258b into tm-qpr-dev am: 5249cb65 -s ours am: 25b6fd0b -s ours

am skip reason: Merged-In I969578802afec4722e3a0d9f946d79384d80a941 with SHA-1 dc124dae is already in history

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



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