Merge "floss: Fix cannot find os/bt_keystore.h and missing include" am:...

Merge "floss: Fix cannot find os/bt_keystore.h and missing include" am: 99cab193 am: 86597868 am: 179396f8 am: 5b649b30

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1877922

Change-Id: I8f0fd6164a39f79ffc20c204f2055a75c38b7c8d