[automerged blank] Use message ID from proto for BT APM notification 2p: 47d70626de

Blank merge reason: Change-Id I109ea5b7703dbffd01b22ed1c8867a8c96b7c002 with SHA-1 6a6bfaeb04 is in history

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

Bug: 249590939
Bug: 239983569
Change-Id: I0c8fca911d4273754fa530fd58e10cc61df4f00a
Merged-In: I109ea5b7703dbffd01b22ed1c8867a8c96b7c002