Merge changes from topic "cherrypick-bt-apm-notification-6f5u3o536b-tm-mainline-prod"

* changes:
  [automerged blank] Use message ID from proto for BT APM notification 2p: 47d70626de
  Use message ID from proto for BT APM notification Bug: 249590939 Bug: 239983569 Test: atest ServiceBluetoothTests