[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" am: 698946dd am: 5d7c674a am: 230b2877 am: 06a1af1b -s ours am: 0fa29c0b -s ours

am skip reason: Merged-In I109ea5b7703dbffd01b22ed1c8867a8c96b7c002 with SHA-1 6a6bfaeb is already in history

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



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