[automerger skipped] Merge "DO NOT MERGE - Merge TP1A.220624.021.A1" into...

[automerger skipped] Merge "DO NOT MERGE - Merge TP1A.220624.021.A1" into stage-aosp-master am: 9c6f4c28 -s ours am: 154497cf -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: I6d9d03ac4a964bc983500513c4ecf102dd574d6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>