[automerger skipped] Update preparers to align across everything am:...

[automerger skipped] Update preparers to align across everything am: e55f46c6 am: 3fc47eb1 am: ac992abf -s ours

am skip reason: Merged-In Id3b4dfd87cd7c271e0f39eac903de6f182da8d6f with SHA-1 efa4e5ae is already in history

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



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