Merge "Modify APM enhancement feature notification string" am: 4f070130 am:...

Merge "Modify APM enhancement feature notification string" am: 4f070130 am: 033694e1 am: bc8cd53e

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



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