[automerger skipped] Merge "Inti enabled_sets_ after get...

[automerger skipped] Merge "Inti enabled_sets_ after get advertising_api_type_" into tm-qpr-dev am: b74279fa -s ours

am skip reason: Merged-In I9b34e64d060389b0528dc9f21635e8b65d823780 with SHA-1 b1bfa65c is already in history

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



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