Merge "[Private GATT] Enable feature flags" am: e238a382 am: 0c3822a0 am:...

Merge "[Private GATT] Enable feature flags" am: e238a382 am: 0c3822a0 am: b6070a76 am: 689abfc1 am: b31d1fa7

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



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