[automerger skipped] Merge "Use system properties to config GATT parameters"...

[automerger skipped] Merge "Use system properties to config GATT parameters" into tm-qpr-dev am: 4f4ed5de am: 5fcde54a -s ours

am skip reason: Merged-In Ida572a7874c78a100529e8a843861a7d8aab7379 with SHA-1 d66d3032 is already in history

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



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