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" am: 698946dd am: 5d7c674a am: 230b2877

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2192274



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