[automerger skipped] Merge "APCF: move AD type filter to 0x09" into tm-qpr-dev...

[automerger skipped] Merge "APCF: move AD type filter to 0x09" into tm-qpr-dev am: 36930951 am: 39cb77d1 -s ours

am skip reason: Merged-In I4568ab33a868786d4bb2fc6d36bb7516553569de with SHA-1 3b239009 is already in history

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



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