[automerger skipped] DO NOT MERGE - Merge TP1A.220624.021.A1 am: 63f325c7 -s...

[automerger skipped] DO NOT MERGE - Merge TP1A.220624.021.A1 am: 63f325c7 -s ours am: 75882aad -s ours am: 45e9aacd -s ours

am skip reason: Merged-In I30941e8b9344e9dbaacaec5ca2c2046d149ed839 with SHA-1 bf9246b0 is already in history

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



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