Merge "avoid std::allocator<const T>" into main am: dd10b491 am: 8e76e9d4

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



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