[automerger skipped] Merge "Use message ID from proto for BT APM notification...

[automerger skipped] Merge "Use message ID from proto for BT APM notification Bug: 239983569 Test: atest ServiceBluetoothTests Ignore-AOSP-First: resolve merge conflict on internal first" am: e96042de am: 13284ad6 am: 59278a20 am: 25baf1d2 -s ours am: 121b48e2 -s ours

am skip reason: Merged-In Id16cb1e0a89d66d9d5cb250ca5de987ef558e447 with SHA-1 ffc0b153 is already in history

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



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