Merge "Bluetooth APM enhancement" am: 1ff93b6c am: e215da8b am: b84b65ba

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



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