Merge "Use message ID from proto for BT APM notification Bug: 239983569 Test:...

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

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



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