[automerger skipped] Merge changes I9786d38f,I9d6b0d89 into tm-qpr-dev am: af48a082 -s ours

am skip reason: Merged-In I9786d38f702086c93cc852b5500f160318d4d70a with SHA-1 f67ab8e3 is already in history

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



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