[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "cherrypicker-L79300000956516311:N67600001297819102" into tm-qpr-dev am: e521730c am: 883c239a -s ours

am skip reason: Merged-In I58bd8e1cfb83ac6c75fa0c6abd860a9bd128801c with SHA-1 a7deb825 is already in history

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



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