Merge "package: Add a new BLE channel sounding feature flag" into main am:...

Merge "package: Add a new BLE channel sounding feature flag" into main am: 0c9aa397 am: 896a9064

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3353035



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