[automerger skipped] Merge "Add internal constant to resolve merge-conflict"...

[automerger skipped] Merge "Add internal constant to resolve merge-conflict" am: f4903895 am: 0ae6e0e0 -s ours

am skip reason: Merged-In I3191701c54b342ef3cf2296de075666b13e3096e with SHA-1 ecd5a3e8 is already in history

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



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