Merge "Floss: fix chromeos metrics signature" am: 9a8ccc5a am: e0eb8964

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



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