[automerger skipped] Merge "Adding tests for APM enhancement" am: 62f18822...

[automerger skipped] Merge "Adding tests for APM enhancement" am: 62f18822 am: 0f5bd6bf am: fb4eb6b2 am: e2c28c4b -s ours

am skip reason: Merged-In I4c73840f8c6e3a983a3c1f065733e26cf7140bf9 with SHA-1 96f1c0d2 is already in history

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



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