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

Merge "Floss: fix chromeos metrics signature" am: 9a8ccc5a am: e0eb8964 am: 9f95c2dd am: 9fda29fc am: 08e9ceab

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



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