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

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



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