Merge "vc: Fix duplicate operation discriminator" am: 1d70665a am: aef5c25f am: 9269268d

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



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