[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" into tm-qpr-dev-plus-aosp am: d6017291 -s ours

am skip reason: Merged-In I109ea5b7703dbffd01b22ed1c8867a8c96b7c002 with SHA-1 09bce7e9 is already in history

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



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