[automerger skipped] Merge "Use message ID from proto for BT APM notification Bug: 239983569 Test: atest ServiceBluetoothTests" into tm-qpr-dev am: aa19ed3581 -s ours am: cfde4ecd9b -s ours
am skip reason: Merged-In I109ea5b7703dbffd01b22ed1c8867a8c96b7c002 with SHA-1 8d48b7db19 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19625163
Change-Id: I3fc3c31967b73d4b3785fd1421851e2b1c5a41e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: