[automerger skipped] Merge TP1A.220905.004 to stage-aosp-master - DO NOT MERGE am: 095297ba -s ours

am skip reason: Merged-In I417dd352fa6dd2a23f76fe81c751ed34db1c4185 with SHA-1 cd09baab is already in history

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



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