[automerger skipped] Merge "Fix missing advertising set callbacks" into tm-qpr-dev am: e71c262e -s ours

am skip reason: Merged-In I56f3149e622515e314292044352600a12d2dd568 with SHA-1 212357f2 is already in history

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



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