Merge "floss: Fix "unused manifest key" warning" into main am: 784bc045 am: 56f49f58

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



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