Merge "Remove unused field" into main am: f200f084 am: 5536553f

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



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