[automerger skipped] Merge "Use message ID from proto for BT APM notification Bug: 239983569 Test: atest ServiceBluetoothTests Ignore-AOSP-First: resolve merge conflict on internal first" into tm-qpr-dev am: dd6bfd8b -s ours

am skip reason: Merged-In Id16cb1e0a89d66d9d5cb250ca5de987ef558e447 with SHA-1 e0a60390 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/19625612



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