Merge "Fix Stub override when argument is already defined" am: b0ef194e am: 1b7e0471

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



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