Merge changes from topic "am-a5bf379bbb554d03a6f985b9e40d85ee" into tm-qpr-dev-plus-aosp

* changes:
  [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
  [automerger skipped] Use message ID from proto for BT APM notification am: 6a6bfaeb04 -s ours
This commit is contained in:
Automerger Merge Worker
2022-08-20 00:17:54 +00:00
committed by Android (Google) Code Review

Diff Content Not Available