Merge "Use message ID from proto for BT APM notification Bug: 239983569 Test: atest ServiceBluetoothTests" am: 698946dd4e

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

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