[automerger skipped] Merge "Bluetooth APM enhancement" am: 1ff93b6c am:...

[automerger skipped] Merge "Bluetooth APM enhancement" am: 1ff93b6c am: e215da8b am: b84b65ba am: 2863429a -s ours

am skip reason: Merged-In I2092880e047a1a9d50a47e4724e5fb2815d04f2d with SHA-1 3e9249a6 is already in history

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



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