[automerger skipped] Merge changes from topic "bluetooth_prebuilt_phase4" into...

[automerger skipped] Merge changes from topic "bluetooth_prebuilt_phase4" into udc-dev am: 29154ebd -s ours

am skip reason: Merged-In Ie70c5a40a00b57d8c65857151774e6346acced85 with SHA-1 1d02bb3a is already in history

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



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