Merge "Bluetooth APM enhancement" into tm-qpr-dev am: 42e7b1d3 am: 3239d3c1

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



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