[automerger skipped] Merge "Add additional overriding methods to signature...

[automerger skipped] Merge "Add additional overriding methods to signature files" into main am: b4a4a0ed am: b4088f7e am: 4c9a3792 am: 57b0f506 am: a15a0e2a -s ours

am skip reason: Merged-In I7ab25d25fbd2ad793a2910d67ae541fa5e07ebc2 with SHA-1 fd44afa4 is already in history

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



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